diff --git a/Changelog.yaml b/Changelog.yaml
index 8efb7317d7..d58c10d6dd 100644
--- a/Changelog.yaml
+++ b/Changelog.yaml
@@ -4,6 +4,72 @@
 # for important features/bug fixes.
 # Also, each release can have new and improved recipes.
 
+- version: 0.7.9
+  date: 2010-07-17
+
+  new features:
+    - title: "New unified toolbar"
+      type: major
+      description: >
+        "A new unified toolbar combines the old toolbar and device display, to save space. Now when a device is connected, buttons 
+        are created in the unified toolbar for the device and its storage cards. Click the arrow next to the button to eject the device."
+
+    - title: "Device drivers: Add option to allow calibre to automatically manage metadata on the device in Preferences->Add/Save->Sending to device"
+
+    - title: "BibTeX output for catalogs. The list of books in calibre can now also be output as a .bib file"
+
+    - title: "A new toolbar button to choose/create different calibre libraries. Be careful using it if you also use custom columns."
+
+    - title: "Support for the MiBuk"
+
+  bug fixes:
+    - title: "MOBI metadata: Replace HTML entities in the title read from the MOBI file"
+
+    - title: "Conversion pipeline: Handle elements with percentage sizes that are children of zero size parents correctly."
+      tickets: [6155]
+
+    - title: "Fix regression that made LRF conversion less robust"
+      tickets: [6180]
+
+    - title: "FB2 Input: Handle embedded images correctly, so that EPUB generated from FB2 works with Adobe Digital Editions."
+      tickets: [6183]
+
+    - title: "Fix regression that prevented old news from being deleted in the calibre library if calibre is never kept running for more than an hour"
+
+    - title: "RTF Input: Fix handling of text align and superscript/subscripts"
+      tickets: [3644,5060]
+
+    - title: "Fix long series or publisher names causing convert dialog to become too wide"
+
+    - title: "SONY driver: Fix handling of invalid XML databases with null bytes"
+      tickets: [6165]
+
+    - title: "iTunes driver: Better series_index sorting"
+
+    - title: "Improved editing of dates for custom columns"
+
+    - title: "Linux USB scanner: Don't fail to start calibre if SYFS is not present. Instead simply fail to detect devices"
+      tickets: [6156]
+
+    - title: "Android driver: Show books on device if Aldiko is being used"
+      tickets: [6100]
+
+    - title: "Upgrade to Qt 4.6.3 in all binary builds to ensure proper rendering of the new toolbar icons"
+
+    - title: "Fix handling of entities in epub files by the epub-fix command"
+      tickets: [6136]
+
+  new recipes:
+    - title: "EL Pain Impresso"
+      author: Darko Miletic
+
+    - title: "MIT Technology Review, Alternet, Waco Tribune Herald and Orlando Sentinel"
+      author: rty
+
+  improved recipes:
+    - Google Reader
+
+
 - version: 0.7.8
   date: 2010-07-09
 
diff --git a/resources/recipes/alternet.recipe b/resources/recipes/alternet.recipe
new file mode 100644
index 0000000000..f885225d31
--- /dev/null
+++ b/resources/recipes/alternet.recipe
@@ -0,0 +1,38 @@
+from calibre.ptempfile import PersistentTemporaryFile
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class Alternet(BasicNewsRecipe):
+    title          = u'Alternet'
+    __author__= 'rty'
+    oldest_article = 7
+    max_articles_per_feed = 100
+    publisher = 'alternet.org'
+    category = 'News, Magazine'
+    description = 'News magazine and online community'
+    feeds          = [
+	(u'Front Page', u'http://feeds.feedblitz.com/alternet'),
+	(u'Breaking News', u'http://feeds.feedblitz.com/alternet_breaking_news'),
+	(u'Top Ten Campaigns', u'http://feeds.feedblitz.com/alternet_top_10_campaigns'),
+	(u'Special Coverage Areas', u'http://feeds.feedblitz.com/alternet_coverage')
+	]
+    remove_attributes = ['width', 'align','cellspacing']
+    remove_javascript = True
+    use_embedded_content   = False
+    no_stylesheets = True
+    language = 'en'
+    encoding               = 'UTF-8'
+    temp_files = []
+    articles_are_obfuscated = True
+
+    def get_article_url(self, article):
+       return article.get('link',  None)
+
+    def get_obfuscated_article(self, url):
+        br = self.get_browser()
+        br.open(url)
+        response = br.follow_link(url_regex = r'/printversion/[0-9]+', nr = 0)
+        html = response.read()
+        self.temp_files.append(PersistentTemporaryFile('_fa.html'))
+        self.temp_files[-1].write(html)
+        self.temp_files[-1].close()
+        return self.temp_files[-1].name
diff --git a/resources/recipes/technology_review.recipe b/resources/recipes/technology_review.recipe
new file mode 100644
index 0000000000..f001fcf4c1
--- /dev/null
+++ b/resources/recipes/technology_review.recipe
@@ -0,0 +1,44 @@
+import string
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class TechnologyReview(BasicNewsRecipe):
+    title          = u'Technology Review'
+    __author__ = 'rty'
+    description = 'MIT Technology Magazine'
+    publisher = 'Technology Review Inc.'
+    category = 'Technology, Innovation, R&D'
+    oldest_article = 14
+    max_articles_per_feed = 100
+    No_stylesheets = True
+    extra_css = """
+    .ArticleBody {font: normal; text-align: justify}
+    .headline {font: bold x-large}
+    .subheadline {font: italic large}
+    """
+    feeds = [
+	(u'Computing', u'http://feeds.technologyreview.com/technology_review_Computing'),
+	(u'Web', u'http://feeds.technologyreview.com/technology_review_Web'),
+	(u'Communications', u'http://feeds.technologyreview.com/technology_review_Communications'),
+	(u'Energy', u'http://feeds.technologyreview.com/technology_review_Energy'),
+	(u'Materials', u'http://feeds.technologyreview.com/technology_review_Materials'),
+	(u'Biomedicine', u'http://feeds.technologyreview.com/technology_review_Biotech'),
+	(u'Business', u'http://feeds.technologyreview.com/technology_review_Biztech')
+	]
+    remove_attributes = ['width', 'align','cellspacing']
+
+    remove_tags = [
+                    dict(name='div', attrs={'id':['CloseLink','footerAdDiv','copyright']}),
+                         ]
+    remove_tags_after = [dict(name='div', attrs={'id':'copyright'})]
+
+    def get_article_url(self, article):
+        return article.get('guid', article.get('id', None))
+
+
+    def print_version(self, url):
+        baseurl='http://www.technologyreview.com/printer_friendly_article.aspx?id='
+        split1 = string.split(url,"/")
+        xxx=split1 [4]
+        split2= string.split(xxx,"/")
+        s =  baseurl + split2[0]
+        return s
diff --git a/resources/templates/rtf.xsl b/resources/templates/rtf.xsl
index 74696f0857..c3162b0c15 100644
--- a/resources/templates/rtf.xsl
+++ b/resources/templates/rtf.xsl
@@ -265,9 +265,20 @@
             <xsl:value-of select="@line-height"/>
             <xsl:text>pt;</xsl:text>
         </xsl:if>
+        <xsl:if test="(@align = 'just')">
+            <xsl:text>text-align: justify;</xsl:text>
+        </xsl:if>
+        <xsl:if test="(@align = 'cent')">
+            <xsl:text>text-align: center;</xsl:text>
+        </xsl:if>
+        <xsl:if test="(@align = 'left')">
+            <xsl:text>text-align: left;</xsl:text>
+        </xsl:if>
+        <xsl:if test="(@align = 'right')">
+            <xsl:text>text-align: right;</xsl:text>
+        </xsl:if>
     </xsl:template>
 
-
     <xsl:template match="rtf:inline">
         <xsl:variable name="num-attrs" select="count(@*)"/>
         <xsl:choose>
diff --git a/src/calibre/__init__.py b/src/calibre/__init__.py
index 15bd54c80c..061d0712ce 100644
--- a/src/calibre/__init__.py
+++ b/src/calibre/__init__.py
@@ -440,6 +440,9 @@ xml_entity_to_unicode = partial(entity_to_unicode, result_exceptions = {
     '>' : '&gt;',
     '&' : '&amp;'})
 
+def replace_entities(raw):
+    return _ent_pat.sub(entity_to_unicode, raw)
+
 def prepare_string_for_xml(raw, attribute=False):
     raw = _ent_pat.sub(entity_to_unicode, raw)
     raw = raw.replace('&', '&amp;').replace('<', '&lt;').replace('>', '&gt;')
diff --git a/src/calibre/constants.py b/src/calibre/constants.py
index 540f376ffa..ddcc21d4c5 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.7.8'
+__version__   = '0.7.9'
 __author__    = "Kovid Goyal <kovid@kovidgoyal.net>"
 
 import re
diff --git a/src/calibre/ebooks/fb2/input.py b/src/calibre/ebooks/fb2/input.py
index 248f9bd524..f4f2df9cb5 100644
--- a/src/calibre/ebooks/fb2/input.py
+++ b/src/calibre/ebooks/fb2/input.py
@@ -60,6 +60,9 @@ class FB2Input(InputFormatPlugin):
 
         transform = etree.XSLT(styledoc)
         result = transform(doc)
+        for img in result.xpath('//img[@src]'):
+            src = img.get('src')
+            img.set('src', self.binary_map.get(src, src))
         open('index.xhtml', 'wb').write(transform.tostring(result))
         stream.seek(0)
         mi = get_metadata(stream, 'fb2')
@@ -83,9 +86,15 @@ class FB2Input(InputFormatPlugin):
         return os.path.join(os.getcwd(), 'metadata.opf')
 
     def extract_embedded_content(self, doc):
+        self.binary_map = {}
         for elem in doc.xpath('./*'):
             if 'binary' in elem.tag and elem.attrib.has_key('id'):
+                ct = elem.get('content-type', '')
                 fname = elem.attrib['id']
+                ext = ct.rpartition('/')[-1].lower()
+                if ext in ('png', 'jpeg', 'jpg'):
+                    fname += '.' + ext
+                    self.binary_map[elem.get('id')] = fname
                 data = b64decode(elem.text.strip())
                 open(fname, 'wb').write(data)
 
diff --git a/src/calibre/ebooks/lrf/input.py b/src/calibre/ebooks/lrf/input.py
index 256ab6fdf2..1d730ab573 100644
--- a/src/calibre/ebooks/lrf/input.py
+++ b/src/calibre/ebooks/lrf/input.py
@@ -368,7 +368,15 @@ class LRFInput(InputFormatPlugin):
         if options.verbose > 2:
             open('lrs.xml', 'wb').write(xml.encode('utf-8'))
         parser = etree.XMLParser(no_network=True, huge_tree=True)
-        doc = etree.fromstring(xml, parser=parser)
+        try:
+            doc = etree.fromstring(xml, parser=parser)
+        except:
+            self.log.warn('Failed to parse XML. Trying to recover')
+            parser = etree.XMLParser(no_network=True, huge_tree=True,
+                    recover=True)
+            doc = etree.fromstring(xml, parser=parser)
+
+
         char_button_map = {}
         for x in doc.xpath('//CharButton[@refobj]'):
             ro = x.get('refobj')
diff --git a/src/calibre/ebooks/mobi/reader.py b/src/calibre/ebooks/mobi/reader.py
index e18a95dd2d..2a35c7cb45 100644
--- a/src/calibre/ebooks/mobi/reader.py
+++ b/src/calibre/ebooks/mobi/reader.py
@@ -14,7 +14,8 @@ except ImportError:
 
 from lxml import html, etree
 
-from calibre import xml_entity_to_unicode, CurrentDir, entity_to_unicode
+from calibre import xml_entity_to_unicode, CurrentDir, entity_to_unicode, \
+    replace_entities
 from calibre.utils.filenames import ascii_filename
 from calibre.utils.date import parse_date
 from calibre.ptempfile import TemporaryDirectory
@@ -70,7 +71,7 @@ class EXTHHeader(object):
             #else:
             #    print 'unknown record', id, repr(content)
         if title:
-            self.mi.title = title
+            self.mi.title = replace_entities(title)
 
     def process_metadata(self, id, content, codec):
         if id == 100:
diff --git a/src/calibre/ebooks/oeb/stylizer.py b/src/calibre/ebooks/oeb/stylizer.py
index 4789899fbf..f465935376 100644
--- a/src/calibre/ebooks/oeb/stylizer.py
+++ b/src/calibre/ebooks/oeb/stylizer.py
@@ -475,7 +475,8 @@ class Style(object):
             value = float(m.group(1))
             unit = m.group(2)
             if unit == '%':
-                base = base or self.width
+                if base is None:
+                    base = self.width
                 result = (value / 100.0) * base
             elif unit == 'px':
                 result = value * 72.0 / self._profile.dpi
diff --git a/src/calibre/ebooks/rtf/input.py b/src/calibre/ebooks/rtf/input.py
index d5e1a95157..50f5571d58 100644
--- a/src/calibre/ebooks/rtf/input.py
+++ b/src/calibre/ebooks/rtf/input.py
@@ -192,12 +192,18 @@ class RTFInput(InputFormatPlugin):
         from calibre.ebooks.rtf2xml.ParseRtf import RtfInvalidCodeException
         self.log = log
         self.log('Converting RTF to XML...')
+        #Name of the preprocesssed RTF file
         fname = self.preprocess(stream.name)
         try:
             xml = self.generate_xml(fname)
         except RtfInvalidCodeException, e:
             raise ValueError(_('This RTF file has a feature calibre does not '
             'support. Convert it to HTML first and then try it.\n%s')%e)
+        
+        '''dataxml = open('dataxml.xml', 'w')
+        dataxml.write(xml)
+        dataxml.close'''
+        
         d = glob.glob(os.path.join('*_rtf_pict_dir', 'picts.rtf'))
         if d:
             imap = {}
@@ -205,6 +211,7 @@ class RTFInput(InputFormatPlugin):
                 imap = self.extract_images(d[0])
             except:
                 self.log.exception('Failed to extract images...')
+        
         self.log('Parsing XML...')
         parser = etree.XMLParser(recover=True, no_network=True)
         doc = etree.fromstring(xml, parser=parser)
@@ -214,10 +221,10 @@ class RTFInput(InputFormatPlugin):
             name = imap.get(num, None)
             if name is not None:
                 pict.set('num', name)
+
         self.log('Converting XML to HTML...')
         inline_class = InlineClass(self.log)
         styledoc = etree.fromstring(P('templates/rtf.xsl', data=True))
-
         extensions = { ('calibre', 'inline-class') : inline_class }
         transform = etree.XSLT(styledoc, extensions=extensions)
         result = transform(doc)
diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py
index d922af0914..41d72d17f1 100644
--- a/src/calibre/gui2/__init__.py
+++ b/src/calibre/gui2/__init__.py
@@ -4,7 +4,7 @@ __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
 import os, sys
 from threading import RLock
 
-from PyQt4.Qt import QVariant, QFileInfo, QObject, SIGNAL, QBuffer, Qt, QSize, \
+from PyQt4.Qt import QVariant, QFileInfo, QObject, SIGNAL, QBuffer, Qt, \
                          QByteArray, QTranslator, QCoreApplication, QThread, \
                          QEvent, QTimer, pyqtSignal, QDate, QDesktopServices, \
                          QFileDialog, QMessageBox, QPixmap, QFileIconProvider, \
@@ -33,10 +33,6 @@ def _config():
               help=_('Send file to storage card instead of main memory by default'))
     c.add_opt('confirm_delete', default=False,
               help=_('Confirm before deleting'))
-    c.add_opt('toolbar_icon_size', default=QSize(48, 48),
-              help=_('Toolbar icon size')) # value QVariant.toSize
-    c.add_opt('show_text_in_toolbar', default=True,
-              help=_('Show button labels in the toolbar'))
     c.add_opt('main_window_geometry', default=None,
               help=_('Main window geometry')) # value QVariant.toByteArray
     c.add_opt('new_version_notification', default=True,
diff --git a/src/calibre/gui2/convert/structure_detection.ui b/src/calibre/gui2/convert/structure_detection.ui
index 2e97c0d3ca..eb2892a07a 100644
--- a/src/calibre/gui2/convert/structure_detection.ui
+++ b/src/calibre/gui2/convert/structure_detection.ui
@@ -58,7 +58,7 @@
    <item row="9" column="0" colspan="2">
     <widget class="XPathEdit" name="opt_page_breaks_before" native="true"/>
    </item>
-   <item row="10" column="0">
+   <item row="10" column="0" colspan="2">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
diff --git a/src/calibre/gui2/convert/xexp_edit.ui b/src/calibre/gui2/convert/xexp_edit.ui
index f98eb8b1b8..f3427bce23 100644
--- a/src/calibre/gui2/convert/xexp_edit.ui
+++ b/src/calibre/gui2/convert/xexp_edit.ui
@@ -43,12 +43,6 @@
          <height>0</height>
         </size>
        </property>
-       <property name="maximumSize">
-        <size>
-         <width>500</width>
-         <height>16777215</height>
-        </size>
-       </property>
        <property name="minimumContentsLength">
         <number>30</number>
        </property>
diff --git a/src/calibre/gui2/device.py b/src/calibre/gui2/device.py
index bc8ba7c381..c919547956 100644
--- a/src/calibre/gui2/device.py
+++ b/src/calibre/gui2/device.py
@@ -638,7 +638,6 @@ class DeviceMixin(object): # {{{
         self.device_error_dialog = error_dialog(self, _('Error'),
                 _('Error communicating with device'), ' ')
         self.device_error_dialog.setModal(Qt.NonModal)
-        self.device_connected = None
         self.emailer = Emailer()
         self.emailer.start()
         self.device_manager = DeviceManager(Dispatcher(self.device_detected),
@@ -755,17 +754,14 @@ class DeviceMixin(object): # {{{
                 self.device_manager.device.__class__.get_gui_name()+\
                         _(' detected.'), 3000)
             self.device_connected = device_kind
-            self.location_view.model().device_connected(self.device_manager.device)
             self.refresh_ondevice_info (device_connected = True, reset_only = True)
         else:
             self.device_connected = None
             self.status_bar.device_disconnected()
-            self.location_view.model().update_devices()
             if self.current_view() != self.library_view:
                 self.book_details.reset_info()
-                self.location_view.setCurrentIndex(self.location_view.model().index(0))
-            self.refresh_ondevice_info (device_connected = False)
-        self.tool_bar.device_status_changed(bool(connected))
+            self.location_manager.update_devices()
+            self.refresh_ondevice_info(device_connected=False)
 
     def info_read(self, job):
         '''
@@ -774,7 +770,8 @@ class DeviceMixin(object): # {{{
         if job.failed:
             return self.device_job_exception(job)
         info, cp, fs = job.result
-        self.location_view.model().update_devices(cp, fs)
+        self.location_manager.update_devices(cp, fs,
+                self.device_manager.device.icon)
         self.status_bar.device_connected(info[0])
         self.device_manager.books(Dispatcher(self.metadata_downloaded))
 
@@ -1076,9 +1073,9 @@ class DeviceMixin(object): # {{{
             dynamic.set('catalogs_to_be_synced', set([]))
             if files:
                 remove = []
-                space = { self.location_view.model().free[0] : None,
-                    self.location_view.model().free[1] : 'carda',
-                    self.location_view.model().free[2] : 'cardb' }
+                space = { self.location_manager.free[0] : None,
+                    self.location_manager.free[1] : 'carda',
+                    self.location_manager.free[2] : 'cardb' }
                 on_card = space.get(sorted(space.keys(), reverse=True)[0], None)
                 self.upload_books(files, names, metadata,
                         on_card=on_card,
@@ -1140,9 +1137,9 @@ class DeviceMixin(object): # {{{
             dynamic.set('news_to_be_synced', set([]))
             if config['upload_news_to_device'] and files:
                 remove = ids if del_on_upload else []
-                space = { self.location_view.model().free[0] : None,
-                    self.location_view.model().free[1] : 'carda',
-                    self.location_view.model().free[2] : 'cardb' }
+                space = { self.location_manager.free[0] : None,
+                    self.location_manager.free[1] : 'carda',
+                    self.location_manager.free[2] : 'cardb' }
                 on_card = space.get(sorted(space.keys(), reverse=True)[0], None)
                 self.upload_books(files, names, metadata,
                         on_card=on_card,
@@ -1263,7 +1260,8 @@ class DeviceMixin(object): # {{{
             self.device_job_exception(job)
             return
         cp, fs = job.result
-        self.location_view.model().update_devices(cp, fs)
+        self.location_manager.update_devices(cp, fs,
+                self.device_manager.device.icon)
         # reset the views so that up-to-date info is shown. These need to be
         # here because the sony driver updates collections in sync_booklists
         self.memory_view.reset()
diff --git a/src/calibre/gui2/dialogs/choose_library.py b/src/calibre/gui2/dialogs/choose_library.py
new file mode 100644
index 0000000000..03bd303112
--- /dev/null
+++ b/src/calibre/gui2/dialogs/choose_library.py
@@ -0,0 +1,90 @@
+#!/usr/bin/env python
+# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
+
+__license__   = 'GPL v3'
+__copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>'
+__docformat__ = 'restructuredtext en'
+
+import os
+
+from PyQt4.Qt import QDialog
+
+from calibre.gui2.dialogs.choose_library_ui import Ui_Dialog
+from calibre.gui2 import error_dialog, choose_dir, warning_dialog
+from calibre.constants import filesystem_encoding
+from calibre import isbytestring, patheq
+from calibre.utils.config import prefs
+from calibre.gui2.wizard import move_library
+
+class ChooseLibrary(QDialog, Ui_Dialog):
+
+    def __init__(self, db, callback, parent):
+        QDialog.__init__(self, parent)
+        self.setupUi(self)
+        self.db = db
+        self.new_db = None
+        self.callback = callback
+        self.location.initialize('choose_library_dialog')
+
+        lp = db.library_path
+        if isbytestring(lp):
+            lp = lp.decode(filesystem_encoding)
+        loc = unicode(self.old_location.text()).format(lp)
+        self.old_location.setText(loc)
+        self.browse_button.clicked.connect(self.choose_loc)
+
+    def choose_loc(self, *args):
+        loc = choose_dir(self, 'choose library location',
+                _('Choose location for calibre library'))
+        if loc is not None:
+            self.location.setText(loc)
+
+    def check_action(self, ac, loc):
+        exists = self.db.exists_at(loc)
+        if patheq(loc, self.db.library_path):
+            error_dialog(self, _('Same as current'),
+                    _('The location %s contains the current calibre'
+                        ' library')%loc, show=True)
+            return False
+        empty = not os.listdir(loc)
+        if ac == 'existing' and not exists:
+            error_dialog(self, _('No existing library found'),
+                    _('There is no existing calibre library at %s')%loc,
+                    show=True)
+            return False
+        if ac in ('new', 'move') and not empty:
+            error_dialog(self, _('Not empty'),
+                    _('The folder %s is not empty. Please choose an empty'
+                       ' folder')%loc,
+                    show=True)
+            return False
+
+        return True
+
+    def perform_action(self, ac, loc):
+        if ac in ('new', 'existing'):
+            warning_dialog(self.parent(), _('Custom columns'),
+                    _('If you use custom columns and they differ between '
+                        'libraries, you will have various problems. Best '
+                        'to ensure you have the same custom columns in each '
+                        'library.'), show=True)
+        if ac in ('new', 'existing'):
+            prefs['library_path'] = loc
+            self.callback(loc)
+        else:
+            move_library(self.db.library_path, loc, self.parent(),
+                    self.callback)
+
+    def accept(self):
+        action = 'move'
+        if self.existing_library.isChecked():
+            action = 'existing'
+        elif self.empty_library.isChecked():
+            action = 'new'
+        loc = os.path.abspath(unicode(self.location.text()).strip())
+        if not loc or not os.path.exists(loc) or not self.check_action(action,
+                loc):
+            return
+        QDialog.accept(self)
+        self.location.save_history()
+        self.perform_action(action, loc)
diff --git a/src/calibre/gui2/dialogs/choose_library.ui b/src/calibre/gui2/dialogs/choose_library.ui
new file mode 100644
index 0000000000..ca2cfd5d96
--- /dev/null
+++ b/src/calibre/gui2/dialogs/choose_library.ui
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Dialog</class>
+ <widget class="QDialog" name="Dialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>602</width>
+    <height>245</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Choose your calibre library</string>
+  </property>
+  <property name="windowIcon">
+   <iconset resource="../../../../resources/images.qrc">
+    <normaloff>:/images/lt.png</normaloff>:/images/lt.png</iconset>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0" colspan="4">
+    <widget class="QLabel" name="old_location">
+     <property name="text">
+      <string>Your calibre library is currently located at {0}</string>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0">
+    <widget class="QLabel" name="label_2">
+     <property name="text">
+      <string>New &amp;Location:</string>
+     </property>
+     <property name="buddy">
+      <cstring>location</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="0" colspan="4">
+    <widget class="QRadioButton" name="existing_library">
+     <property name="text">
+      <string>Use &amp;existing library at the new location</string>
+     </property>
+     <property name="checked">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="0" colspan="3">
+    <widget class="QRadioButton" name="empty_library">
+     <property name="text">
+      <string>&amp;Create an empty library at the new location</string>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="0" colspan="3">
+    <widget class="QRadioButton" name="move_library">
+     <property name="text">
+      <string>&amp;Move current library to new location</string>
+     </property>
+    </widget>
+   </item>
+   <item row="8" column="2">
+    <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>
+   <item row="7" column="2">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="3" column="0">
+    <spacer name="verticalSpacer_2">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="1" column="0">
+    <spacer name="verticalSpacer_3">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="2" column="3">
+    <widget class="QToolButton" name="browse_button">
+     <property name="text">
+      <string>...</string>
+     </property>
+     <property name="icon">
+      <iconset resource="../../../../resources/images.qrc">
+       <normaloff>:/images/document_open.svg</normaloff>:/images/document_open.svg</iconset>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1" colspan="2">
+    <widget class="HistoryLineEdit" name="location"/>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>HistoryLineEdit</class>
+   <extends>QComboBox</extends>
+   <header>calibre/gui2/widgets.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources>
+  <include location="../../../../resources/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/config/__init__.py b/src/calibre/gui2/dialogs/config/__init__.py
index b064dc53c2..84d55c8fb6 100644
--- a/src/calibre/gui2/dialogs/config/__init__.py
+++ b/src/calibre/gui2/dialogs/config/__init__.py
@@ -14,7 +14,7 @@ from PyQt4.Qt import    QDialog, QListWidgetItem, QIcon, \
 from calibre.constants import iswindows, isosx
 from calibre.gui2.dialogs.config.config_ui import Ui_Dialog
 from calibre.gui2.dialogs.config.create_custom_column import CreateCustomColumn
-from calibre.gui2 import choose_dir, error_dialog, config, gprefs, \
+from calibre.gui2 import error_dialog, config, gprefs, \
         open_url, open_local_file, \
         ALL_COLUMNS, NONE, info_dialog, choose_files, \
         warning_dialog, ResizableDialog, question_dialog
@@ -343,9 +343,6 @@ class ConfigDialog(ResizableDialog, Ui_Dialog):
         self.model = library_view.model()
         self.db = self.model.db
         self.server = server
-        path = prefs['library_path']
-        self.location.setText(path if path else '')
-        self.connect(self.browse_button, SIGNAL('clicked(bool)'), self.browse)
         self.connect(self.compact_button, SIGNAL('clicked(bool)'), self.compact)
 
         input_map = prefs['input_format_order']
@@ -808,12 +805,6 @@ class ConfigDialog(ResizableDialog, Ui_Dialog):
         d = CheckIntegrity(self.db, self)
         d.exec_()
 
-    def browse(self):
-        dir = choose_dir(self, 'database location dialog',
-                         _('Select location for books'))
-        if dir:
-            self.location.setText(dir)
-
     def accept(self):
         mcs = unicode(self.max_cover_size.text()).strip()
         if not re.match(r'\d+x\d+', mcs):
@@ -834,7 +825,6 @@ class ConfigDialog(ResizableDialog, Ui_Dialog):
         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())
-        path = unicode(self.location.text())
         input_cols = [unicode(self.input_order.item(i).data(Qt.UserRole).toString()) for i in range(self.input_order.count())]
         prefs['input_format_order'] = input_cols
 
@@ -875,24 +865,13 @@ class ConfigDialog(ResizableDialog, Ui_Dialog):
         val = self.opt_gui_layout.itemData(self.opt_gui_layout.currentIndex()).toString()
         config['gui_layout'] = unicode(val)
 
-        if not path or not os.path.exists(path) or not os.path.isdir(path):
-            d = error_dialog(self, _('Invalid database location'),
-                             _('Invalid database location ')+path+
-                             _('<br>Must be a directory.'))
-            d.exec_()
-        elif not os.access(path, os.W_OK):
-            d = error_dialog(self, _('Invalid database location'),
-                     _('Invalid database location.<br>Cannot write to ')+path)
-            d.exec_()
-        else:
-            self.database_location = os.path.abspath(path)
-            if must_restart:
-                warning_dialog(self, _('Must restart'),
-                        _('The changes you made require that Calibre be '
-                            'restarted. Please restart as soon as practical.'),
-                        show=True, show_copy_button=False)
-                self.parent.must_restart_before_config = True
-            QDialog.accept(self)
+        if must_restart:
+            warning_dialog(self, _('Must restart'),
+                    _('The changes you made require that Calibre be '
+                        'restarted. Please restart as soon as practical.'),
+                    show=True, show_copy_button=False)
+            self.parent.must_restart_before_config = True
+        QDialog.accept(self)
 
 class VacThread(QThread):
 
diff --git a/src/calibre/gui2/dialogs/config/config.ui b/src/calibre/gui2/dialogs/config/config.ui
index 5f890631b2..5d6bff2467 100644
--- a/src/calibre/gui2/dialogs/config/config.ui
+++ b/src/calibre/gui2/dialogs/config/config.ui
@@ -113,50 +113,6 @@
            </property>
            <widget class="QWidget" name="page_3">
             <layout class="QVBoxLayout" name="verticalLayout">
-             <item>
-              <layout class="QVBoxLayout" name="_2">
-               <item>
-                <widget class="QLabel" name="label">
-                 <property name="maximumSize">
-                  <size>
-                   <width>16777215</width>
-                   <height>70</height>
-                  </size>
-                 </property>
-                 <property name="text">
-                  <string>&amp;Location of ebooks (The ebooks are stored in folders sorted by author and metadata is stored in the file metadata.db)</string>
-                 </property>
-                 <property name="wordWrap">
-                  <bool>true</bool>
-                 </property>
-                 <property name="buddy">
-                  <cstring>location</cstring>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <layout class="QHBoxLayout" name="_3">
-                 <item>
-                  <widget class="QLineEdit" name="location"/>
-                 </item>
-                 <item>
-                  <widget class="QToolButton" name="browse_button">
-                   <property name="toolTip">
-                    <string>Browse for the new database location</string>
-                   </property>
-                   <property name="text">
-                    <string>...</string>
-                   </property>
-                   <property name="icon">
-                    <iconset resource="../../../../../resources/images.qrc">
-                     <normaloff>:/images/mimetypes/dir.svg</normaloff>:/images/mimetypes/dir.svg</iconset>
-                   </property>
-                  </widget>
-                 </item>
-                </layout>
-               </item>
-              </layout>
-             </item>
              <item>
               <widget class="QCheckBox" name="new_version_notification">
                <property name="text">
diff --git a/src/calibre/gui2/dialogs/jobs.ui b/src/calibre/gui2/dialogs/jobs.ui
index 1fb23269e6..0fc946f996 100644
--- a/src/calibre/gui2/dialogs/jobs.ui
+++ b/src/calibre/gui2/dialogs/jobs.ui
@@ -60,7 +60,7 @@
    <item>
     <widget class="QPushButton" name="stop_all_jobs_button">
      <property name="text">
-      <string>Stop &amp;all jobs</string>
+      <string>Stop &amp;all non device jobs</string>
      </property>
     </widget>
    </item>
diff --git a/src/calibre/gui2/dialogs/scheduler.py b/src/calibre/gui2/dialogs/scheduler.py
index 7e2d75e9e7..7b4af2d162 100644
--- a/src/calibre/gui2/dialogs/scheduler.py
+++ b/src/calibre/gui2/dialogs/scheduler.py
@@ -10,7 +10,7 @@ Scheduler for automated recipe downloads
 from datetime import timedelta
 
 from PyQt4.Qt import QDialog, SIGNAL, Qt, QTime, QObject, QMenu, \
-        QAction, QIcon, QMutex, QTimer
+        QAction, QIcon, QMutex, QTimer, pyqtSignal
 
 from calibre.gui2.dialogs.scheduler_ui import Ui_Dialog
 from calibre.gui2.search_box import SearchBox2
@@ -203,6 +203,9 @@ class Scheduler(QObject):
 
     INTERVAL = 1 # minutes
 
+    delete_old_news = pyqtSignal(object)
+    start_recipe_fetch = pyqtSignal(object)
+
     def __init__(self, parent, db):
         QObject.__init__(self, parent)
         self.internet_connection_failed = False
@@ -225,20 +228,23 @@ class Scheduler(QObject):
                 self.download_all_scheduled)
 
         self.timer = QTimer(self)
-        self.timer.start(int(self.INTERVAL * 60000))
+        self.timer.start(int(self.INTERVAL * 60 * 1000))
         self.oldest_timer = QTimer()
         self.connect(self.oldest_timer, SIGNAL('timeout()'), self.oldest_check)
         self.connect(self.timer, SIGNAL('timeout()'), self.check)
         self.oldest = gconf['oldest_news']
-        self.oldest_timer.start(int(60 * 60000))
-        self.oldest_check()
+        self.oldest_timer.start(int(60 * 60 * 1000))
+        QTimer.singleShot(5 * 1000, self.oldest_check)
+        self.database_changed = self.recipe_model.database_changed
 
     def oldest_check(self):
         if self.oldest > 0:
             delta = timedelta(days=self.oldest)
             ids = self.recipe_model.db.tags_older_than(_('News'), delta)
             if ids:
-                self.emit(SIGNAL('delete_old_news(PyQt_PyObject)'), ids)
+                ids = list(ids)
+                if ids:
+                    self.delete_old_news.emit(ids)
 
     def show_dialog(self, *args):
         self.lock.lock()
@@ -282,7 +288,7 @@ class Scheduler(QObject):
                     'urn':urn,
                    }
             self.download_queue.add(urn)
-            self.emit(SIGNAL('start_recipe_fetch(PyQt_PyObject)'), arg)
+            self.start_recipe_fetch.emit(arg)
         finally:
             self.lock.unlock()
 
diff --git a/src/calibre/gui2/init.py b/src/calibre/gui2/init.py
index 2474685522..254d2c3d00 100644
--- a/src/calibre/gui2/init.py
+++ b/src/calibre/gui2/init.py
@@ -7,14 +7,13 @@ __docformat__ = 'restructuredtext en'
 
 import functools, sys, os
 
-from PyQt4.Qt import QMenu, Qt, pyqtSignal, QIcon, QStackedWidget, \
-        QSize, QSizePolicy, QStatusBar, QUrl, QLabel, QFont
+from PyQt4.Qt import QMenu, Qt, QStackedWidget, \
+        QSize, QSizePolicy, QStatusBar, QLabel, QFont
 
 from calibre.utils.config import prefs
-from calibre.ebooks import BOOK_EXTENSIONS
 from calibre.constants import isosx, __appname__, preferred_encoding, \
     __version__
-from calibre.gui2 import config, is_widescreen, open_url
+from calibre.gui2 import config, is_widescreen
 from calibre.gui2.library.views import BooksView, DeviceBooksView
 from calibre.gui2.widgets import Splitter
 from calibre.gui2.tag_view import TagBrowserWidget
@@ -28,157 +27,6 @@ def partial(*args, **kwargs):
     _keep_refs.append(ans)
     return ans
 
-class SaveMenu(QMenu): # {{{
-
-    save_fmt = pyqtSignal(object)
-
-    def __init__(self, parent):
-        QMenu.__init__(self, _('Save single format to disk...'), parent)
-        for ext in sorted(BOOK_EXTENSIONS):
-            action = self.addAction(ext.upper())
-            setattr(self, 'do_'+ext, partial(self.do, ext))
-            action.triggered.connect(
-                    getattr(self, 'do_'+ext))
-
-    def do(self, ext, *args):
-        self.save_fmt.emit(ext)
-
-# }}}
-
-class ToolbarMixin(object): # {{{
-
-    def __init__(self):
-        self.action_help.triggered.connect(self.show_help)
-        md = QMenu()
-        md.addAction(_('Edit metadata individually'),
-                partial(self.edit_metadata, False, bulk=False))
-        md.addSeparator()
-        md.addAction(_('Edit metadata in bulk'),
-                partial(self.edit_metadata, False, bulk=True))
-        md.addSeparator()
-        md.addAction(_('Download metadata and covers'),
-                partial(self.download_metadata, False, covers=True),
-                Qt.ControlModifier+Qt.Key_D)
-        md.addAction(_('Download only metadata'),
-                partial(self.download_metadata, False, covers=False))
-        md.addAction(_('Download only covers'),
-                partial(self.download_metadata, False, covers=True,
-                    set_metadata=False, set_social_metadata=False))
-        md.addAction(_('Download only social metadata'),
-                partial(self.download_metadata, False, covers=False,
-                    set_metadata=False, set_social_metadata=True))
-        self.metadata_menu = md
-
-        mb = QMenu()
-        mb.addAction(_('Merge into first selected book - delete others'),
-                self.merge_books)
-        mb.addSeparator()
-        mb.addAction(_('Merge into first selected book - keep others'),
-                partial(self.merge_books, safe_merge=True))
-        self.merge_menu = mb
-        self.action_merge.setMenu(mb)
-        md.addSeparator()
-        md.addAction(self.action_merge)
-
-        self.add_menu = QMenu()
-        self.add_menu.addAction(_('Add books from a single directory'),
-                self.add_books)
-        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_recursive_single)
-        self.add_menu.addAction(_('Add books from directories, including '
-            'sub directories (Multiple books per directory, assumes every '
-            'ebook file is a different book)'), self.add_recursive_multiple)
-        self.add_menu.addAction(_('Add Empty book. (Book entry with no '
-            'formats)'), self.add_empty)
-        self.action_add.setMenu(self.add_menu)
-        self.action_add.triggered.connect(self.add_books)
-        self.action_del.triggered.connect(self.delete_books)
-        self.action_edit.triggered.connect(self.edit_metadata)
-        self.action_merge.triggered.connect(self.merge_books)
-
-        self.action_save.triggered.connect(self.save_to_disk)
-        self.save_menu = QMenu()
-        self.save_menu.addAction(_('Save to disk'), partial(self.save_to_disk,
-            False))
-        self.save_menu.addAction(_('Save to disk in a single directory'),
-                partial(self.save_to_single_dir, False))
-        self.save_menu.addAction(_('Save only %s format to disk')%
-                prefs['output_format'].upper(),
-                partial(self.save_single_format_to_disk, False))
-        self.save_menu.addAction(
-                _('Save only %s format to disk in a single directory')%
-                prefs['output_format'].upper(),
-                partial(self.save_single_fmt_to_single_dir, False))
-        self.save_sub_menu = SaveMenu(self)
-        self.save_menu.addMenu(self.save_sub_menu)
-        self.save_sub_menu.save_fmt.connect(self.save_specific_format_disk)
-
-        self.action_view.triggered.connect(self.view_book)
-        self.view_menu = QMenu()
-        self.view_menu.addAction(_('View'), partial(self.view_book, False))
-        ac = self.view_menu.addAction(_('View specific format'))
-        ac.setShortcut((Qt.ControlModifier if isosx else Qt.AltModifier)+Qt.Key_V)
-        self.action_view.setMenu(self.view_menu)
-        ac.triggered.connect(self.view_specific_format, type=Qt.QueuedConnection)
-
-        self.delete_menu = QMenu()
-        self.delete_menu.addAction(_('Remove selected books'), self.delete_books)
-        self.delete_menu.addAction(
-                _('Remove files of a specific format from selected books..'),
-                self.delete_selected_formats)
-        self.delete_menu.addAction(
-                _('Remove all formats from selected books, except...'),
-                self.delete_all_but_selected_formats)
-        self.delete_menu.addAction(
-                _('Remove covers from selected books'), self.delete_covers)
-        self.delete_menu.addSeparator()
-        self.delete_menu.addAction(
-                _('Remove matching books from device'),
-                self.remove_matching_books_from_device)
-        self.action_del.setMenu(self.delete_menu)
-
-        self.action_open_containing_folder.setShortcut(Qt.Key_O)
-        self.addAction(self.action_open_containing_folder)
-        self.action_open_containing_folder.triggered.connect(self.view_folder)
-        self.action_sync.setShortcut(Qt.Key_D)
-        self.action_sync.setEnabled(True)
-        self.create_device_menu()
-        self.action_sync.triggered.connect(
-                self._sync_action_triggered)
-
-        self.action_edit.setMenu(md)
-        self.action_save.setMenu(self.save_menu)
-
-        cm = QMenu()
-        cm.addAction(_('Convert individually'), partial(self.convert_ebook,
-            False, bulk=False))
-        cm.addAction(_('Bulk convert'),
-                partial(self.convert_ebook, False, bulk=True))
-        cm.addSeparator()
-        ac = cm.addAction(
-                _('Create catalog of books in your calibre library'))
-        ac.triggered.connect(self.generate_catalog)
-        self.action_convert.setMenu(cm)
-        self.action_convert.triggered.connect(self.convert_ebook)
-        self.convert_menu = cm
-
-        pm = QMenu()
-        pm.addAction(QIcon(I('config.svg')), _('Preferences'), self.do_config)
-        pm.addAction(QIcon(I('wizard.svg')), _('Run welcome wizard'),
-                self.run_wizard)
-        self.action_preferences.setMenu(pm)
-        self.preferences_menu = pm
-        for x in (self.preferences_action, self.action_preferences):
-            x.triggered.connect(self.do_config)
-
-    def show_help(self, *args):
-        open_url(QUrl('http://calibre-ebook.com/user_manual'))
-
-
-# }}}
-
 class LibraryViewMixin(object): # {{{
 
     def __init__(self, db):
diff --git a/src/calibre/gui2/layout.py b/src/calibre/gui2/layout.py
index c1ff3ab505..8604587649 100644
--- a/src/calibre/gui2/layout.py
+++ b/src/calibre/gui2/layout.py
@@ -6,108 +6,106 @@ __copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
 from operator import attrgetter
+from functools import partial
 
-from PyQt4.Qt import QIcon, Qt, QWidget, QAction, QToolBar, QSize, QVariant, \
-    QAbstractListModel, QFont, QApplication, QPalette, pyqtSignal, QToolButton, \
-    QModelIndex, QListView, QAbstractButton, QPainter, QPixmap, QColor, \
-    QVBoxLayout, QSizePolicy, QLabel, QHBoxLayout
+from PyQt4.Qt import QIcon, Qt, QWidget, QAction, QToolBar, QSize, \
+    pyqtSignal, QToolButton, \
+    QObject, QVBoxLayout, QSizePolicy, QLabel, QHBoxLayout, QActionGroup, \
+    QMenu, QUrl
 
-from calibre.constants import __appname__, filesystem_encoding
+from calibre.constants import __appname__, isosx
 from calibre.gui2.search_box import SearchBox2, SavedSearchBox
 from calibre.gui2.throbber import ThrobbingButton
-from calibre.gui2 import NONE, config
+from calibre.gui2 import config, open_url
 from calibre.gui2.widgets import ComboBoxWithHelp
 from calibre import human_readable
+from calibre.utils.config import prefs
+from calibre.ebooks import BOOK_EXTENSIONS
+from calibre.gui2.dialogs.scheduler import Scheduler
 
 ICON_SIZE = 48
 
-# Location View {{{
+class SaveMenu(QMenu): # {{{
 
-class LocationModel(QAbstractListModel): # {{{
-
-    devicesChanged = pyqtSignal()
+    save_fmt = pyqtSignal(object)
 
     def __init__(self, parent):
-        QAbstractListModel.__init__(self, parent)
-        self.icons = [QVariant(QIcon(I('library.png'))),
-                      QVariant(QIcon(I('reader.svg'))),
-                      QVariant(QIcon(I('sd.svg'))),
-                      QVariant(QIcon(I('sd.svg')))]
-        self.text = [_('Library\n%d books'),
-                     _('Reader\n%s'),
-                     _('Card A\n%s'),
-                     _('Card B\n%s')]
+        QMenu.__init__(self, _('Save single format to disk...'), parent)
+        for ext in sorted(BOOK_EXTENSIONS):
+            action = self.addAction(ext.upper())
+            setattr(self, 'do_'+ext, partial(self.do, ext))
+            action.triggered.connect(
+                    getattr(self, 'do_'+ext))
+
+    def do(self, ext, *args):
+        self.save_fmt.emit(ext)
+
+# }}}
+
+class LocationManager(QObject): # {{{
+
+    locations_changed = pyqtSignal()
+    unmount_device = pyqtSignal()
+    location_selected = pyqtSignal(object)
+
+    def __init__(self, parent=None):
+        QObject.__init__(self, parent)
         self.free = [-1, -1, -1]
         self.count = 0
-        self.highlight_row = 0
-        self.library_tooltip = _('Click to see the books available on your computer')
-        self.tooltips = [
-                         self.library_tooltip,
-                         _('Click to see the books in the main memory of your reader'),
-                         _('Click to see the books on storage card A in your reader'),
-                         _('Click to see the books on storage card B in your reader')
-                         ]
+        self.location_actions = QActionGroup(self)
+        self.location_actions.setExclusive(True)
+        self.current_location = 'library'
+        self._mem = []
+        self.tooltips = {}
 
-    def database_changed(self, db):
-        lp = db.library_path
-        if not isinstance(lp, unicode):
-            lp = lp.decode(filesystem_encoding, 'replace')
-        self.tooltips[0] = self.library_tooltip + '\n\n' + \
-                _('Books located at') + ' ' + lp
-        self.dataChanged.emit(self.index(0), self.index(0))
+        def ac(name, text, icon, tooltip):
+            icon = QIcon(I(icon))
+            ac = self.location_actions.addAction(icon, text)
+            setattr(self, 'location_'+name, ac)
+            ac.setAutoRepeat(False)
+            ac.setCheckable(True)
+            receiver = partial(self._location_selected, name)
+            ac.triggered.connect(receiver)
+            self.tooltips[name] = tooltip
+            if name != 'library':
+                m = QMenu(parent)
+                self._mem.append(m)
+                a = m.addAction(icon, tooltip)
+                a.triggered.connect(receiver)
+                self._mem.append(a)
+                a = m.addAction(QIcon(I('eject.svg')), _('Eject this device'))
+                a.triggered.connect(self._eject_requested)
+                ac.setMenu(m)
+                self._mem.append(a)
+            else:
+                ac.setToolTip(tooltip)
 
-    def rowCount(self, *args):
-        return 1 + len([i for i in self.free if i >= 0])
+            return ac
 
-    def get_device_row(self, row):
-        if row == 2 and self.free[1] == -1 and self.free[2] > -1:
-            row = 3
-        return row
+        ac('library', _('Library'), 'lt.png',
+                _('Show books in calibre library'))
+        ac('main', _('Reader'), 'reader.svg',
+                _('Show books in the main memory of the device'))
+        ac('carda', _('Card A'), 'sd.svg',
+                _('Show books in storage card A'))
+        ac('cardb', _('Card B'), 'sd.svg',
+                _('Show books in storage card B'))
 
-    def get_tooltip(self, row, drow):
-        ans = self.tooltips[row]
-        if row > 0:
-            fs = self.free[drow-1]
-            if fs > -1:
-                ans += '\n\n%s '%(human_readable(fs)) + _('free')
-        return ans
+    def _location_selected(self, location, *args):
+        if location != self.current_location and hasattr(self,
+                'location_'+location):
+            self.current_location = location
+            self.location_selected.emit(location)
+            getattr(self, 'location_'+location).setChecked(True)
 
-    def data(self, index, role):
-        row = index.row()
-        drow = self.get_device_row(row)
-        data = NONE
-        if role == Qt.DisplayRole:
-            text = self.text[drow]%(human_readable(self.free[drow-1])) if row > 0 \
-                            else self.text[drow]%self.count
-            data = QVariant(text)
-        elif role == Qt.DecorationRole:
-            data = self.icons[drow]
-        elif role in (Qt.ToolTipRole, Qt.StatusTipRole):
-            ans = self.get_tooltip(row, drow)
-            data = QVariant(ans)
-        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)
-        elif role == Qt.ForegroundRole and row == self.highlight_row:
-            return QVariant(QApplication.palette().brush(
-                QPalette.HighlightedText))
-        elif role == Qt.BackgroundRole and row == self.highlight_row:
-            return QVariant(QApplication.palette().brush(
-                QPalette.Highlight))
+    def _eject_requested(self, *args):
+        self.unmount_device.emit()
 
-        return data
-
-    def device_connected(self, dev):
-        self.icons[1] = QIcon(dev.icon)
-        self.dataChanged.emit(self.index(1), self.index(1))
-
-    def headerData(self, section, orientation, role):
-        return NONE
-
-    def update_devices(self, cp=(None, None), fs=[-1, -1, -1]):
+    def update_devices(self, cp=(None, None), fs=[-1, -1, -1], icon=None):
+        if icon is None:
+            icon = I('reader.svg')
+        self.location_main.setIcon(QIcon(icon))
+        had_device = self.has_device
         if cp is None:
             cp = (None, None)
         if isinstance(cp, (str, unicode)):
@@ -120,137 +118,34 @@ class LocationModel(QAbstractListModel): # {{{
         cpa, cpb = cp
         self.free[1] = fs[1] if fs[1] is not None and cpa is not None else -1
         self.free[2] = fs[2] if fs[2] is not None and cpb is not None else -1
-        self.reset()
-        self.devicesChanged.emit()
+        self.update_tooltips()
+        if self.has_device != had_device:
+            self.locations_changed.emit()
+            if not self.has_device:
+                self.location_library.trigger()
 
-    def location_changed(self, row):
-        self.highlight_row = row
-        self.dataChanged.emit(
-                self.index(0), self.index(self.rowCount(QModelIndex())-1))
+    def update_tooltips(self):
+        for i, loc in enumerate(('main', 'carda', 'cardb')):
+            t = self.tooltips[loc]
+            if self.free[i] > -1:
+                t += u'\n\n%s '%human_readable(self.free[i]) + _('available')
+            ac = getattr(self, 'location_'+loc)
+            ac.setToolTip(t)
+            ac.setWhatsThis(t)
+            ac.setStatusTip(t)
 
-    def location_for_row(self, row):
-        if row == 0: return 'library'
-        if row == 1: return 'main'
-        if row == 3: return 'cardb'
-        return 'carda' if self.free[1] > -1 else 'cardb'
-
-# }}}
-
-class LocationView(QListView):
-
-    umount_device = pyqtSignal()
-    location_selected = pyqtSignal(object)
-
-    def __init__(self, parent):
-        QListView.__init__(self, parent)
-        self.setModel(LocationModel(self))
-        self.reset()
-        self.currentChanged = self.current_changed
-
-        self.eject_button = EjectButton(self)
-        self.eject_button.hide()
-
-        self.entered.connect(self.item_entered)
-        self.viewportEntered.connect(self.viewport_entered)
-        self.eject_button.clicked.connect(self.eject_clicked)
-        self.model().devicesChanged.connect(self.eject_button.hide)
-        self.setSizePolicy(QSizePolicy(QSizePolicy.Expanding,
-            QSizePolicy.Expanding))
-        self.setMouseTracking(True)
-        self.setVerticalScrollBarPolicy(Qt.ScrollBarAlwaysOff)
-        self.setHorizontalScrollBarPolicy(Qt.ScrollBarAsNeeded)
-        self.setEditTriggers(self.NoEditTriggers)
-        self.setTabKeyNavigation(True)
-        self.setProperty("showDropIndicator", True)
-        self.setSelectionMode(self.SingleSelection)
-        self.setIconSize(QSize(ICON_SIZE, ICON_SIZE))
-        self.setMovement(self.Static)
-        self.setFlow(self.LeftToRight)
-        self.setGridSize(QSize(175, ICON_SIZE))
-        self.setViewMode(self.ListMode)
-        self.setWordWrap(True)
-        self.setObjectName("location_view")
-        self.setMaximumSize(QSize(600, ICON_SIZE+16))
-        self.setMinimumWidth(400)
-
-    def eject_clicked(self, *args):
-        self.umount_device.emit()
-
-    def count_changed(self, new_count):
-        self.model().count = new_count
-        self.model().reset()
 
     @property
-    def book_count(self):
-        return self.model().count
-
-    def current_changed(self, current, previous):
-        if current.isValid():
-            i = current.row()
-            location = self.model().location_for_row(i)
-            self.location_selected.emit(location)
-            self.model().location_changed(i)
-
-    def location_changed(self, row):
-        if 0 <= row and row <= 3:
-            self.model().location_changed(row)
-
-    def leaveEvent(self, event):
-        self.unsetCursor()
-        self.eject_button.hide()
-
-    def item_entered(self, location):
-        self.setCursor(Qt.PointingHandCursor)
-        self.eject_button.hide()
-
-        if location.row() == 1:
-            rect = self.visualRect(location)
-
-            self.eject_button.resize(rect.height()/2, rect.height()/2)
-
-            x, y = rect.left(), rect.top()
-            x = x + (rect.width() - self.eject_button.width() - 2)
-            y += 6
-
-            self.eject_button.move(x, y)
-            self.eject_button.show()
-
-    def viewport_entered(self):
-        self.unsetCursor()
-        self.eject_button.hide()
-
-
-class EjectButton(QAbstractButton):
-
-    def __init__(self, parent):
-        QAbstractButton.__init__(self, parent)
-        self.mouse_over = False
-        self.setMouseTracking(True)
-
-    def enterEvent(self, event):
-        self.mouse_over = True
-        QAbstractButton.enterEvent(self, event)
-
-    def leaveEvent(self, event):
-        self.mouse_over = False
-        QAbstractButton.leaveEvent(self, event)
-
-    def paintEvent(self, event):
-        painter = QPainter(self)
-        painter.setClipRect(event.rect())
-        image = QPixmap(I('eject')).scaledToHeight(event.rect().height(),
-            Qt.SmoothTransformation)
-
-        if not self.mouse_over:
-            alpha_mask = QPixmap(image.width(), image.height())
-            color = QColor(128, 128, 128)
-            alpha_mask.fill(color)
-            image.setAlphaChannel(alpha_mask)
-
-        painter.drawPixmap(0, 0, image)
-
-
+    def has_device(self):
+        return max(self.free) > -1
 
+    @property
+    def available_actions(self):
+        ans = [self.location_library]
+        for i, loc in enumerate(('main', 'carda', 'cardb')):
+            if self.free[i] > -1:
+                ans.append(getattr(self, 'location_'+loc))
+        return ans
 
 # }}}
 
@@ -326,7 +221,7 @@ class SearchBar(QWidget): # {{{
 
 class ToolBar(QToolBar): # {{{
 
-    def __init__(self, actions, donate, location_view, parent=None):
+    def __init__(self, actions, donate, location_manager, parent=None):
         QToolBar.__init__(self, parent)
         self.setContextMenuPolicy(Qt.PreventContextMenu)
         self.setMovable(False)
@@ -335,11 +230,12 @@ class ToolBar(QToolBar): # {{{
         self.setAllowedAreas(Qt.TopToolBarArea|Qt.BottomToolBarArea)
         self.setIconSize(QSize(ICON_SIZE, ICON_SIZE))
         self.setToolButtonStyle(Qt.ToolButtonTextUnderIcon)
+        self.setStyleSheet('QToolButton:checked { font-weight: bold }')
 
-        self.showing_device = False
         self.all_actions = actions
         self.donate = donate
-        self.location_view = location_view
+        self.location_manager = location_manager
+        self.location_manager.locations_changed.connect(self.build_bar)
         self.d_widget = QWidget()
         self.d_widget.setLayout(QVBoxLayout())
         self.d_widget.layout().addWidget(donate)
@@ -350,40 +246,45 @@ class ToolBar(QToolBar): # {{{
     def contextMenuEvent(self, *args):
         pass
 
-    def device_status_changed(self, connected):
-        self.showing_device = connected
-        self.build_bar()
-
     def build_bar(self):
-        order_field = 'device' if self.showing_device else 'normal'
+        showing_device = self.location_manager.has_device
+        order_field = 'device' if showing_device else 'normal'
         o = attrgetter(order_field+'_order')
-        sepvals = [2] if self.showing_device else [1]
+        sepvals = [2] if showing_device else [1]
         sepvals += [3]
         actions = [x for x in self.all_actions if o(x) > -1]
         actions.sort(cmp=lambda x,y : cmp(o(x), o(y)))
         self.clear()
-        for x in actions:
-            self.addAction(x)
-            ch = self.widgetForAction(x)
+
+
+        def setup_tool_button(ac):
+            ch = self.widgetForAction(ac)
             ch.setCursor(Qt.PointingHandCursor)
             ch.setAutoRaise(True)
-
-            if x.action_name == 'choose_library':
-                self.location_action = self.addWidget(self.location_view)
-                self.choose_action = x
-                if config['show_donate_button']:
-                    self.addWidget(self.d_widget)
-            if x.action_name not in ('choose_library', 'help'):
+            if ac.menu() is not None:
                 ch.setPopupMode(ch.MenuButtonPopup)
 
+        for x in actions:
+            self.addAction(x)
+            setup_tool_button(x)
+
+            if x.action_name == 'choose_library':
+                self.choose_action = x
+                if showing_device:
+                    self.addSeparator()
+                    for ac in self.location_manager.available_actions:
+                        self.addAction(ac)
+                        setup_tool_button(ac)
+                    self.addSeparator()
+                    self.location_manager.location_library.trigger()
+                elif config['show_donate_button']:
+                    self.addWidget(self.d_widget)
 
         for x in actions:
             if x.separator_before in sepvals:
                 self.insertSeparator(x)
 
-
-        self.location_action.setVisible(self.showing_device)
-        self.choose_action.setVisible(not self.showing_device)
+        self.choose_action.setVisible(not showing_device)
 
     def count_changed(self, new_count):
         text = _('%d books')%new_count
@@ -397,6 +298,9 @@ class ToolBar(QToolBar): # {{{
         self.setToolButtonStyle(style)
         QToolBar.resizeEvent(self, ev)
 
+    def database_changed(self, db):
+        pass
+
 # }}}
 
 class Action(QAction):
@@ -404,7 +308,8 @@ class Action(QAction):
 
 class MainWindowMixin(object):
 
-    def __init__(self):
+    def __init__(self, db):
+        self.device_connected = None
         self.setObjectName('MainWindow')
         self.setWindowIcon(QIcon(I('library.png')))
         self.setWindowTitle(__appname__)
@@ -417,9 +322,36 @@ class MainWindowMixin(object):
         self.resize(1012, 740)
         self.donate_button = ThrobbingButton(self.centralwidget)
         self.donate_button.set_normal_icon_size(ICON_SIZE, ICON_SIZE)
+        self.location_manager = LocationManager(self)
 
-        # Actions {{{
+        self.init_scheduler(db)
+        all_actions = self.setup_actions()
 
+        self.search_bar = SearchBar(self)
+        self.tool_bar = ToolBar(all_actions, self.donate_button,
+                self.location_manager, self)
+        self.addToolBar(Qt.TopToolBarArea, self.tool_bar)
+        self.tool_bar.choose_action.triggered.connect(self.choose_library)
+
+        l = self.centralwidget.layout()
+        l.addWidget(self.search_bar)
+
+    def init_scheduler(self, db):
+        self.scheduler = Scheduler(self, db)
+        self.scheduler.start_recipe_fetch.connect(
+                self.download_scheduled_recipe, type=Qt.QueuedConnection)
+
+
+    def read_toolbar_settings(self):
+        pass
+
+    def choose_library(self, *args):
+        from calibre.gui2.dialogs.choose_library import ChooseLibrary
+        db = self.library_view.model().db
+        c = ChooseLibrary(db, self.library_moved, self)
+        c.exec_()
+
+    def setup_actions(self): # {{{
         all_actions = []
 
         def ac(normal_order, device_order, separator_before,
@@ -467,17 +399,139 @@ class MainWindowMixin(object):
         ac(-1, -1, 0, 'books_with_the_same_tags', _('Books with the same tags'),
                 'tags.svg')
 
-        # }}}
+        self.action_news.setMenu(self.scheduler.news_menu)
+        self.action_news.triggered.connect(
+                self.scheduler.show_dialog)
 
-        self.location_view = LocationView(self.centralwidget)
-        self.search_bar = SearchBar(self)
-        self.tool_bar = ToolBar(all_actions, self.donate_button, self.location_view, self)
-        self.addToolBar(Qt.TopToolBarArea, self.tool_bar)
+        self.action_help.triggered.connect(self.show_help)
+        md = QMenu()
+        md.addAction(_('Edit metadata individually'),
+                partial(self.edit_metadata, False, bulk=False))
+        md.addSeparator()
+        md.addAction(_('Edit metadata in bulk'),
+                partial(self.edit_metadata, False, bulk=True))
+        md.addSeparator()
+        md.addAction(_('Download metadata and covers'),
+                partial(self.download_metadata, False, covers=True),
+                Qt.ControlModifier+Qt.Key_D)
+        md.addAction(_('Download only metadata'),
+                partial(self.download_metadata, False, covers=False))
+        md.addAction(_('Download only covers'),
+                partial(self.download_metadata, False, covers=True,
+                    set_metadata=False, set_social_metadata=False))
+        md.addAction(_('Download only social metadata'),
+                partial(self.download_metadata, False, covers=False,
+                    set_metadata=False, set_social_metadata=True))
+        self.metadata_menu = md
 
-        l = self.centralwidget.layout()
-        l.addWidget(self.search_bar)
+        mb = QMenu()
+        mb.addAction(_('Merge into first selected book - delete others'),
+                self.merge_books)
+        mb.addSeparator()
+        mb.addAction(_('Merge into first selected book - keep others'),
+                partial(self.merge_books, safe_merge=True))
+        self.merge_menu = mb
+        self.action_merge.setMenu(mb)
+        md.addSeparator()
+        md.addAction(self.action_merge)
+
+        self.add_menu = QMenu()
+        self.add_menu.addAction(_('Add books from a single directory'),
+                self.add_books)
+        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_recursive_single)
+        self.add_menu.addAction(_('Add books from directories, including '
+            'sub directories (Multiple books per directory, assumes every '
+            'ebook file is a different book)'), self.add_recursive_multiple)
+        self.add_menu.addAction(_('Add Empty book. (Book entry with no '
+            'formats)'), self.add_empty)
+        self.action_add.setMenu(self.add_menu)
+        self.action_add.triggered.connect(self.add_books)
+        self.action_del.triggered.connect(self.delete_books)
+        self.action_edit.triggered.connect(self.edit_metadata)
+        self.action_merge.triggered.connect(self.merge_books)
+
+        self.action_save.triggered.connect(self.save_to_disk)
+        self.save_menu = QMenu()
+        self.save_menu.addAction(_('Save to disk'), partial(self.save_to_disk,
+            False))
+        self.save_menu.addAction(_('Save to disk in a single directory'),
+                partial(self.save_to_single_dir, False))
+        self.save_menu.addAction(_('Save only %s format to disk')%
+                prefs['output_format'].upper(),
+                partial(self.save_single_format_to_disk, False))
+        self.save_menu.addAction(
+                _('Save only %s format to disk in a single directory')%
+                prefs['output_format'].upper(),
+                partial(self.save_single_fmt_to_single_dir, False))
+        self.save_sub_menu = SaveMenu(self)
+        self.save_menu.addMenu(self.save_sub_menu)
+        self.save_sub_menu.save_fmt.connect(self.save_specific_format_disk)
+
+        self.action_view.triggered.connect(self.view_book)
+        self.view_menu = QMenu()
+        self.view_menu.addAction(_('View'), partial(self.view_book, False))
+        ac = self.view_menu.addAction(_('View specific format'))
+        ac.setShortcut((Qt.ControlModifier if isosx else Qt.AltModifier)+Qt.Key_V)
+        self.action_view.setMenu(self.view_menu)
+        ac.triggered.connect(self.view_specific_format, type=Qt.QueuedConnection)
+
+        self.delete_menu = QMenu()
+        self.delete_menu.addAction(_('Remove selected books'), self.delete_books)
+        self.delete_menu.addAction(
+                _('Remove files of a specific format from selected books..'),
+                self.delete_selected_formats)
+        self.delete_menu.addAction(
+                _('Remove all formats from selected books, except...'),
+                self.delete_all_but_selected_formats)
+        self.delete_menu.addAction(
+                _('Remove covers from selected books'), self.delete_covers)
+        self.delete_menu.addSeparator()
+        self.delete_menu.addAction(
+                _('Remove matching books from device'),
+                self.remove_matching_books_from_device)
+        self.action_del.setMenu(self.delete_menu)
+
+        self.action_open_containing_folder.setShortcut(Qt.Key_O)
+        self.addAction(self.action_open_containing_folder)
+        self.action_open_containing_folder.triggered.connect(self.view_folder)
+        self.action_sync.setShortcut(Qt.Key_D)
+        self.action_sync.setEnabled(True)
+        self.create_device_menu()
+        self.action_sync.triggered.connect(
+                self._sync_action_triggered)
+
+        self.action_edit.setMenu(md)
+        self.action_save.setMenu(self.save_menu)
+
+        cm = QMenu()
+        cm.addAction(_('Convert individually'), partial(self.convert_ebook,
+            False, bulk=False))
+        cm.addAction(_('Bulk convert'),
+                partial(self.convert_ebook, False, bulk=True))
+        cm.addSeparator()
+        ac = cm.addAction(
+                _('Create catalog of books in your calibre library'))
+        ac.triggered.connect(self.generate_catalog)
+        self.action_convert.setMenu(cm)
+        self.action_convert.triggered.connect(self.convert_ebook)
+        self.convert_menu = cm
+
+        pm = QMenu()
+        pm.addAction(QIcon(I('config.svg')), _('Preferences'), self.do_config)
+        pm.addAction(QIcon(I('wizard.svg')), _('Run welcome wizard'),
+                self.run_wizard)
+        self.action_preferences.setMenu(pm)
+        self.preferences_menu = pm
+        for x in (self.preferences_action, self.action_preferences):
+            x.triggered.connect(self.do_config)
+
+        return all_actions
+    # }}}
+
+    def show_help(self, *args):
+        open_url(QUrl('http://calibre-ebook.com/user_manual'))
 
 
-    def read_toolbar_settings(self):
-        pass
-
diff --git a/src/calibre/gui2/ui.py b/src/calibre/gui2/ui.py
index ba4c637932..72f7202504 100644
--- a/src/calibre/gui2/ui.py
+++ b/src/calibre/gui2/ui.py
@@ -12,13 +12,13 @@ __docformat__ = 'restructuredtext en'
 import collections, os, sys, textwrap, time
 from Queue import Queue, Empty
 from threading import Thread
-from PyQt4.Qt import Qt, SIGNAL, QObject, QTimer, \
+from PyQt4.Qt import Qt, SIGNAL, QTimer, \
                      QPixmap, QMenu, QIcon, pyqtSignal, \
                      QDialog, \
                      QSystemTrayIcon, QApplication, QKeySequence, QAction, \
                      QMessageBox, QHelpEvent
 
-from calibre import  prints, patheq
+from calibre import  prints
 from calibre.constants import __appname__, isosx
 from calibre.ptempfile import PersistentTemporaryFile
 from calibre.utils.config import prefs, dynamic
@@ -27,8 +27,6 @@ from calibre.gui2 import error_dialog, GetMetadata, open_local_file, \
         gprefs, max_available_height, config, info_dialog
 from calibre.gui2.cover_flow import CoverFlowMixin
 from calibre.gui2.widgets import ProgressIndicator
-from calibre.gui2.wizard import move_library
-from calibre.gui2.dialogs.scheduler import Scheduler
 from calibre.gui2.update import UpdateMixin
 from calibre.gui2.main_window import MainWindow
 from calibre.gui2.layout import MainWindowMixin
@@ -38,7 +36,7 @@ from calibre.gui2.dialogs.config import ConfigDialog
 
 from calibre.gui2.dialogs.book_info import BookInfo
 from calibre.library.database2 import LibraryDatabase2
-from calibre.gui2.init import ToolbarMixin, LibraryViewMixin, LayoutMixin
+from calibre.gui2.init import LibraryViewMixin, LayoutMixin
 from calibre.gui2.search_box import SearchBoxMixin, SavedSearchBoxMixin
 from calibre.gui2.search_restriction_mixin import SearchRestrictionMixin
 from calibre.gui2.tag_view import TagBrowserMixin
@@ -91,7 +89,7 @@ class SystemTrayIcon(QSystemTrayIcon): # {{{
 
 # }}}
 
-class Main(MainWindow, MainWindowMixin, DeviceMixin, ToolbarMixin, # {{{
+class Main(MainWindow, MainWindowMixin, DeviceMixin, # {{{
         TagBrowserMixin, CoverFlowMixin, LibraryViewMixin, SearchBoxMixin,
         SavedSearchBoxMixin, SearchRestrictionMixin, LayoutMixin, UpdateMixin,
         AnnotationsAction, AddAction, DeleteAction,
@@ -120,7 +118,7 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, ToolbarMixin, # {{{
                 self.another_instance_wants_to_talk)
         self.check_messages_timer.start(1000)
 
-        MainWindowMixin.__init__(self)
+        MainWindowMixin.__init__(self, db)
 
         # Jobs Button {{{
         self.job_manager = JobManager()
@@ -192,21 +190,14 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, ToolbarMixin, # {{{
         ####################### Start spare job server ########################
         QTimer.singleShot(1000, self.add_spare_server)
 
-        ####################### Location View ########################
-        QObject.connect(self.location_view,
-                SIGNAL('location_selected(PyQt_PyObject)'),
-                        self.location_selected)
-        QObject.connect(self.location_view,
-                SIGNAL('umount_device()'),
-                        self.device_manager.umount_device)
+        ####################### Location Manager ########################
+        self.location_manager.location_selected.connect(self.location_selected)
+        self.location_manager.unmount_device.connect(self.device_manager.umount_device)
         self.eject_action.triggered.connect(self.device_manager.umount_device)
 
         #################### Update notification ###################
         UpdateMixin.__init__(self, opts)
 
-        ####################### Setup Toolbar #####################
-        ToolbarMixin.__init__(self)
-
         ####################### Search boxes ########################
         SavedSearchBoxMixin.__init__(self)
         SearchBoxMixin.__init__(self)
@@ -218,7 +209,7 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, ToolbarMixin, # {{{
 
         if self.system_tray_icon.isVisible() and opts.start_in_tray:
             self.hide_windows()
-        for t in (self.location_view, self.tool_bar):
+        for t in (self.tool_bar, ):
             self.library_view.model().count_changed_signal.connect \
                                             (t.count_changed)
         if not gprefs.get('quick_start_guide_added', False):
@@ -235,8 +226,8 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, ToolbarMixin, # {{{
                 self.db_images.reset()
 
         self.library_view.model().count_changed()
-        self.location_view.model().database_changed(self.library_view.model().db)
-        self.library_view.model().database_changed.connect(self.location_view.model().database_changed,
+        self.tool_bar.database_changed(self.library_view.model().db)
+        self.library_view.model().database_changed.connect(self.tool_bar.database_changed,
                 type=Qt.QueuedConnection)
 
         ########################### Tags Browser ##############################
@@ -261,18 +252,6 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, ToolbarMixin, # {{{
                     db, server_config().parse())
             self.test_server_timer = QTimer.singleShot(10000, self.test_server)
 
-
-        self.scheduler = Scheduler(self, self.library_view.model().db)
-        self.action_news.setMenu(self.scheduler.news_menu)
-        self.connect(self.action_news, SIGNAL('triggered(bool)'),
-                self.scheduler.show_dialog)
-        self.connect(self.scheduler, SIGNAL('delete_old_news(PyQt_PyObject)'),
-                self.library_view.model().delete_books_by_id,
-                Qt.QueuedConnection)
-        self.connect(self.scheduler,
-                SIGNAL('start_recipe_fetch(PyQt_PyObject)'),
-                self.download_scheduled_recipe, Qt.QueuedConnection)
-
         self.keyboard_interrupt.connect(self.quit, type=Qt.QueuedConnection)
         AddAction.__init__(self)
 
@@ -280,6 +259,11 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, ToolbarMixin, # {{{
         self.finalize_layout()
         self.donate_button.start_animation()
 
+        self.scheduler.delete_old_news.connect(
+                self.library_view.model().delete_books_by_id,
+                type=Qt.QueuedConnection)
+
+
     def resizeEvent(self, ev):
         MainWindow.resizeEvent(self, ev)
         self.search.setMaximumWidth(self.width()-150)
@@ -396,10 +380,6 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, ToolbarMixin, # {{{
             self.tags_view.recount()
             self.create_device_menu()
             self.set_device_menu_items_state(bool(self.device_connected))
-            if not patheq(self.library_path, d.database_location):
-                newloc = d.database_location
-                move_library(self.library_path, newloc, self,
-                        self.library_moved)
 
     def library_moved(self, newloc):
         if newloc is None: return
@@ -414,6 +394,7 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, ToolbarMixin, # {{{
         self.search.clear_to_help()
         self.book_details.reset_info()
         self.library_view.model().count_changed()
+        self.scheduler.database_changed(db)
         prefs['library_path'] = self.library_path
 
     def show_book_info(self, *args):
diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py
index 1534d3ffbf..85e951d4b0 100644
--- a/src/calibre/library/database2.py
+++ b/src/calibre/library/database2.py
@@ -116,6 +116,10 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
         # missing functions
         self.books_list_filter = self.conn.create_dynamic_filter('books_list_filter')
 
+    @classmethod
+    def exists_at(cls, path):
+        return path and os.path.exists(os.path.join(path, 'metadata.db'))
+
     def __init__(self, library_path, row_factory=False):
         self.field_metadata = FieldMetadata()
         if not os.path.exists(library_path):
diff --git a/src/calibre/manual/faq.rst b/src/calibre/manual/faq.rst
index 2b7dbbda35..849a7d5c37 100644
--- a/src/calibre/manual/faq.rst
+++ b/src/calibre/manual/faq.rst
@@ -104,30 +104,46 @@ will appear in the next release of |app|.
 How does |app| manage collections on my SONY reader?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-When |app| connects with the device, it retrieves all collections for the books on the device. The collections
+When |app| connects with the reader, it retrieves all collections for the books on the reader. The collections
 of which books are members are shown on the device view.
 
-When you send a book to the device, |app| will add the book to collections based on the metadata for that book. By
+When you send a book to the reader, |app| will add the book to collections based on the metadata for that book. By
 default, collections are created from tags and series. You can control what metadata is used by going to
 Preferences->Plugins->Device Interface plugins and customizing the SONY device interface plugin. If you remove all
 values, |app| will not add the book to any collection.
 
-Collection management is largely controlled by 'Preserve device collections' found at Preferences->Add/Save->Sending
-to device. If checked (the default), managing collections is left to the user; |app| will not delete already
-existing collections for a book on your device when you resend the book to the device, but |app| will add the book to
-collections if necessary.  To ensure that the collections for a book are based only on current |app| metadata, first
-delete the books from the device, then resend the books.  You can edit collections directly on the device view by
-double-clicking or right-clicking in the collections column.
+Collection management is largely controlled by the 'Metadata management' option found at
+Preferences->Add/Save->Sending to device. If set to 'Manual' (the default), managing collections is left to
+the user; |app| will not delete already existing collections for a book on your reader when you resend the
+book to the reader, but |app| will add the book to collections if necessary.  To ensure that the collections
+for a book are based only on current |app| metadata, first delete the books from the reader, then resend the
+books.  You can edit collections directly on the device view by double-clicking or right-clicking in the
+collections column.
 
-If 'Preserve device collections' is not checked, then |app| will manage collections. Collections will be built using
-|app| metadata exclusively.  Sending a book to the device will correct the collections for that book so its
-collections exactly match the book's metadata. Collections are added and deleted as necessary.  Editing collections on
-the device pane is not permitted, because collections not in the metadata will be removed automatically.
+If 'Metadata management' is set to 'Only on send', then |app| will manage collections more aggressively.
+Collections will be built using |app| metadata exclusively.  Sending a book to the reader will correct the
+collections for that book so its collections exactly match the book's metadata, adding and deleting
+collections as necessary.  Editing collections on the device view is not permitted, because collections not in
+the metadata will be removed automatically.
 
-In summary, check 'Preserve device collections' if you want to manage collections yourself.  Collections for a book
-will never be removed by |app|, but can be removed by you by editing on the device view.  Uncheck 'Preserve device
-collections' if you want |app| to manage the collections, adding books to and removing books from collections as
-needed.  
+If 'Metadata management' is set to 'Automatic management', then |app| will update metadata and collections
+both when the reader is connected and when books are sent. When calibre detects the reader and generates the
+list of books on the reader, it will send metadata from the library to the reader for all books on the reader
+that are in the library (On device is True), adding and removing books from collections as indicated by the
+metadata and device customization. When a book is sent, |app| corrects the metadata for that book, adding and
+deleting collections. Manual editing of metadata on the device view is not allowed. Note that this option
+specifies sending metadata, not books. The book files on the reader are not changed.
+
+In summary, choose 'manual management' if you want to manage collections yourself.  Collections for a book
+will never be removed by |app|, but can be removed by you by editing on the device view.  Choose 'Only on
+send' if you want |app| to manage collections when you send a book, adding books to and removing books from
+collections as needed.  Choose 'Automatic management' if you want |app| to keep collections up to date
+whenever the reader is connected.
+
+If you use multiple installations of calibre to manage your reader, then option 'Automatic management' may not
+be what you want.  Connecting the reader to one library will reset the metadata to what is in that library.
+Connecting to the other library will reset the metadata to what is in that other library. Metadata in books
+found in both libraries will be flopped back and forth.
 
 Can I use both |app| and the SONY software to manage my reader?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/src/calibre/translations/ar.po b/src/calibre/translations/ar.po
index ce7590d6f5..e1272f6df6 100644
--- a/src/calibre/translations/ar.po
+++ b/src/calibre/translations/ar.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-07-03 01:21+0000\n"
-"PO-Revision-Date: 2010-07-03 06:13+0000\n"
-"Last-Translator: Walid <Unknown>\n"
+"POT-Creation-Date: 2010-07-09 22:00+0000\n"
+"PO-Revision-Date: 2010-07-09 20:25+0000\n"
+"Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Arabic <ar@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: 2010-07-04 03:43+0000\n"
+"X-Launchpad-Export-Date: 2010-07-10 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
@@ -27,10 +27,10 @@ msgstr "لا يفعل شيءً"
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:71
 #: /home/kovid/work/calibre/src/calibre/devices/prs500/books.py:267
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:466
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:492
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:396
-#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:98
-#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:101
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:97
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:100
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/metadata.py:56
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:428
 #: /home/kovid/work/calibre/src/calibre/ebooks/fb2/input.py:67
@@ -72,9 +72,9 @@ msgstr "لا يفعل شيءً"
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:818
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:49
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:51
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:910
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:915
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:981
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:911
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:916
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:982
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:137
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:139
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:108
@@ -102,20 +102,20 @@ msgstr "لا يفعل شيءً"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:233
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:290
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:815
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:818
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:814
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:817
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:172
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:179
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:22
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:135
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:903
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:912
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1192
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1195
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:898
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:907
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1190
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1193
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:120
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:155
@@ -123,8 +123,8 @@ msgstr "لا يفعل شيءً"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:172
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:362
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:877
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1054
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:882
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1060
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:87
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:92
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:185
@@ -170,7 +170,7 @@ msgstr "كاتب دليل المعلومات"
 msgid "Catalog generator"
 msgstr "مولد الكاتالوج"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:15
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:16
 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 "
@@ -179,7 +179,7 @@ msgstr ""
 "إلتحاق بكل الوصلات المحلية في ملف HTML وإنشاء ملف ZIP ليحتوي كل الملفات "
 "الموصولة. هذا الملحق ينفّذ كل مرة تضيف ملف HTML إلى المكتبة."
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:51
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:52
 msgid ""
 "Character encoding for the input HTML files. Common choices include: cp1252, "
 "latin1, iso-8859-1 and utf-8."
@@ -187,7 +187,7 @@ msgstr ""
 "رمزالحروف لاجل ملفات HTML المدخلة, تشتمل على الخيارات التالية : cp1252, "
 "latin1, iso-8859-1 وutf-8"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:58
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:59
 msgid ""
 "Create a PMLZ archive containing the PML file and all images in the "
 "directory pmlname_img or images. This plugin is run every time you add a PML "
@@ -197,49 +197,49 @@ msgstr ""
 "pmlname_img او صور. هذا المضاف يتم تشغيله كل مرة اضيف فيها ملف PML الى "
 "المكتبة"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:90
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:93
 msgid "Extract cover from comic files"
 msgstr "استخرج الغلاف من ملف الرسومات"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:117
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:128
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:140
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:150
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:160
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:171
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:181
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:191
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:201
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:211
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:221
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:232
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:243
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:255
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:276
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:287
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:297
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:307
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:120
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:131
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:153
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:163
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:174
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:184
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:194
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:204
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:214
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:224
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:235
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:246
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:258
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:279
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:290
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:300
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:310
 msgid "Read metadata from %s files"
 msgstr "يقرأ دليل المعلومات من الملفات %s"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:266
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:269
 msgid "Read metadata from ebooks in RAR archives"
 msgstr "إقرأ دليل المعلومات لكتب في أرشيفات RAR"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:318
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:321
 msgid "Read metadata from ebooks in ZIP archives"
 msgstr "إقرأ ميتاداتا لكتب في أرشيفات ZIP"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:331
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:341
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:351
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:373
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:384
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:394
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:334
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:344
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:354
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:376
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:387
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:397
 msgid "Set metadata in %s files"
 msgstr "ضبط دليل المعلومات في الملفات %s"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:362
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:365
 msgid "Set metadata from %s files"
 msgstr "ضبط دليل المعلومات من ملفات %s"
 
@@ -396,35 +396,35 @@ msgstr ""
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr "ملف التعريف هذا يستخدم مع Amazon Kindle DX"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:31
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
 msgid "Installed plugins"
 msgstr "ملحقات مثبتة"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:33
 msgid "Mapping for filetype plugins"
 msgstr "تعيين لملحقات أنواع الملفات"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:33
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:34
 msgid "Local plugin customization"
 msgstr "تخصيص الملحقات المحلية"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:34
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
 msgid "Disabled plugins"
 msgstr "ملحقات معطلة"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
 msgid "Enabled plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:83
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:84
 msgid "No valid plugin found in "
 msgstr "لا يجد ملحق صالح "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:460
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:468
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr "فشل استهلال الملحق %s مع اقتفاء الأثر:"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:493
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
 msgid ""
 "    %prog options\n"
 "\n"
@@ -436,29 +436,29 @@ msgstr ""
 "    المقدرة على التخصيص بتحميل الملحقات الخارجية .\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:499
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr "إضافة ملحق يتخصيص مسار إلى ملف zip الذي يحتويه."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr "حذف الملحق المخصص عن طريق اسمه. لا يؤثر على الملحقات المضمنة"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:503
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:511
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
 msgstr "تخصيص الملحق . حدد اسم الملحق وسلسلة التخصيص وفرقهما بفاصلة."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:505
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:513
 msgid "List all installed plugins"
 msgstr "قائمة كل الملحقات المثبتة"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Enable the named plugin"
 msgstr "تمكين الملحق المسمى"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Disable the named plugin"
 msgstr "تعطيل الملحق المسمى"
 
@@ -609,7 +609,7 @@ msgstr "التواصل مع القارئ الكتاب الاليكترونى Han
 msgid "Communicate with the BOOX eBook reader."
 msgstr "التواصل مع القارئ الكتاب الاليكترونى BOOX ."
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:121
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:123
 msgid ""
 "Comma separated list of directories to send e-books to on the device. The "
 "first one that exists will be used."
@@ -680,7 +680,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:51
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:54
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:57
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:157
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:159
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:64
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:67
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:70
@@ -690,22 +690,22 @@ msgstr ""
 msgid "Getting list of books on device..."
 msgstr "يجري إحصاء قائمة كتب من الجهاز..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:218
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:258
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:219
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:263
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:244
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:262
 msgid "Removing books from device..."
 msgstr "يجري حذف الكتب من الجهاز..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:262
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:269
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:267
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:274
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:269
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:274
 msgid "Removing books from device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:274
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:308
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:313
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:208
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:238
 msgid "Adding books to device metadata listing..."
@@ -723,6 +723,10 @@ msgstr ""
 msgid "Communicate with the Sweex MM300"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/misc.py:75
+msgid "Communicate with the Pandigital Novel"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:17
 msgid "Communicate with the Nokia 770 internet tablet."
 msgstr "التواصل مع نوكيا 770"
@@ -1499,6 +1503,51 @@ msgstr ""
 msgid "Creating"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/__init__.py:18
+msgid "ePub Fixer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/epubcheck.py:18
+msgid "Workaround epubcheck bugs"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/epubcheck.py:22
+msgid ""
+"Workarounds for bugs in the latest release of epubcheck. epubcheck reports "
+"many things as errors that are not actually errors. %prog will try to detect "
+"these and replace them with constructs that epubcheck likes. This may cause "
+"significant changes to your epub, complain to the epubcheck project."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:19
+msgid ""
+"%prog [options] file.epub\n"
+"\n"
+"Fix common problems in EPUB files that can cause them to be rejected by "
+"poorly designed publishing services.\n"
+"\n"
+"By default, no fixing is done and messages are printed out for each error "
+"detected. Use the options to control which errors are automatically fixed."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:50
+msgid "You must specify an epub file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:17
+msgid "Fix unmanifested files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:21
+msgid ""
+"Fix unmanifested files. %prog can either add them to the manifest or delete "
+"them as specified by the delete unmanifested option."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:32
+msgid "Delete unmanifested files instead of adding them to the manifest"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:56
 msgid ""
 "Extract the contents of the generated EPUB file to the specified directory. "
@@ -1818,11 +1867,11 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:98
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:882
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:887
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:543
 msgid "Title"
 msgstr "العنوان"
@@ -1831,7 +1880,7 @@ msgstr "العنوان"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:364
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:883
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:888
 msgid "Author(s)"
 msgstr "المؤلف أو المؤلفون"
 
@@ -1854,7 +1903,7 @@ msgstr "المنتج"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:67
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:318
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1073
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1079
 msgid "Comments"
 msgstr "التعليقات"
 
@@ -1863,7 +1912,7 @@ msgstr "التعليقات"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:306
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1069
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1075
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:139
 msgid "Tags"
 msgstr "الوسوم"
@@ -1873,7 +1922,7 @@ msgstr "الوسوم"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:323
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1084
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:87
 msgid "Series"
 msgstr "السلسلة"
@@ -1883,7 +1932,7 @@ msgid "Language"
 msgstr "اللغة"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:406
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1067
 msgid "Timestamp"
 msgstr "ختم التوقيت"
 
@@ -2108,7 +2157,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1226
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1398
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1399
 msgid "Cover"
 msgstr "الغلاف"
 
@@ -2147,70 +2196,70 @@ msgstr ""
 msgid "This is an Amazon Topaz book. It cannot be processed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1399
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1400
 msgid "Title Page"
 msgstr "صقحة العنوان"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1400
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1401
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:15
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:53
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:194
 msgid "Table of Contents"
 msgstr "المحتويات"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1401
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1402
 msgid "Index"
 msgstr "الفهرس"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1402
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1403
 msgid "Glossary"
 msgstr "المسرد"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1403
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1404
 msgid "Acknowledgements"
 msgstr "شكر وتقدير"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1404
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1405
 msgid "Bibliography"
 msgstr "ببليوغرافيا"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1405
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1406
 msgid "Colophon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1406
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1407
 msgid "Copyright"
 msgstr "حقوق المؤلف"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1407
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1408
 msgid "Dedication"
 msgstr "الإهداء"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1408
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1409
 msgid "Epigraph"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1409
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1410
 msgid "Foreword"
 msgstr "افتتاحية"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1410
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1411
 msgid "List of Illustrations"
 msgstr "قائمة الرسوم"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1411
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1412
 msgid "List of Tables"
 msgstr "قائمة الجداول"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1412
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1413
 msgid "Notes"
 msgstr "الملاحظات"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1413
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1414
 msgid "Preface"
 msgstr "افتتاحية"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1414
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1415
 msgid "Main Text"
 msgstr "النصّ الرئيسي"
 
@@ -2254,7 +2303,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:22
 #: /home/kovid/work/calibre/src/calibre/ebooks/tcr/input.py:23
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:23
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:24
 msgid ""
 "Normally calibre treats blank lines as paragraph markers. With this option "
 "it will assume that every line represents a paragraph instead."
@@ -2262,7 +2311,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:26
 #: /home/kovid/work/calibre/src/calibre/ebooks/tcr/input.py:27
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:27
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:28
 msgid ""
 "Normally calibre treats blank lines as paragraph markers. With this option "
 "it will assume that every line starting with an indent (either a tab or 2+ "
@@ -2391,7 +2440,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
 msgid "Author"
 msgstr ""
@@ -2526,19 +2575,19 @@ msgid ""
 "slowest."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:33
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:34
 msgid ""
 "Normally extra spaces are condensed into a single space. With this option "
 "all spaces will be displayed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:36
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:37
 msgid ""
 "Run the text input through the markdown pre-processor. To learn more about "
 "markdown see"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:39
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:40
 msgid "Do not insert a Table of Contents into the output text."
 msgstr ""
 
@@ -2700,7 +2749,7 @@ msgstr ""
 msgid "Copy to Clipboard"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:400
 msgid "Choose Files"
 msgstr ""
 
@@ -2715,13 +2764,13 @@ msgid "User annotations generated from main library only"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:75
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:612
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:671
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:708
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:729
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:877
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1060
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:670
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:707
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:728
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:876
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:941
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1059
 msgid "No books selected"
 msgstr ""
 
@@ -2761,209 +2810,209 @@ msgstr ""
 msgid "How many empty books should be added?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:340
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:390
 msgid "Uploading books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:350
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:137
 msgid "Books"
 msgstr "كتب"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
 msgid "EPUB Books"
 msgstr "كتب EPUB"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
 msgid "LRF Books"
 msgstr "كتب LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
 msgid "HTML Books"
 msgstr "كتب HTML"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
 msgid "LIT Books"
 msgstr "كتب LIT"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
 msgid "MOBI Books"
 msgstr "كتب MOBI"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
 msgid "Topaz books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
 msgid "Text books"
 msgstr "كتب نصّية"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:359
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
 msgid "PDF Books"
 msgstr "كتب PDF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:359
 msgid "Comics"
 msgstr "الرسومات"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:360
 msgid "Archives"
 msgstr "أرشيفات"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:364
 msgid "Supported books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:399
 msgid "Merged some books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:401
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:400
 msgid ""
 "Some duplicates were found and merged into the following existing books:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:409
 msgid "Failed to read metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:410
 msgid "Failed to read metadata from the following"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:434
 msgid "Add to library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:460
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1229
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:459
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1228
 msgid "No book selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:434
 msgid "No book files found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:456
 msgid "Cannot delete"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:469
 msgid "Choose formats to be deleted"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:488
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:487
 msgid "Choose formats <b>not</b> to be deleted"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:507
 msgid "Cannot delete books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:509
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:508
 msgid "No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:519
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:518
 msgid "Main memory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:519
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:444
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:453
 msgid "Storage Card A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:521
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:520
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:446
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:455
 msgid "Storage Card B"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:525
 msgid "No books to delete"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:526
 msgid "None of the selected books are on the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:544
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:600
 msgid "Deleting books from device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:564
 msgid ""
 "The selected books will be <b>permanently deleted</b> and the files removed "
 "from your computer. Are you sure?"
 msgstr "الكتب المختارة <b>سوف تحذف تماماً</b> من حاسوبك. هل أنت متأكّد؟"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:585
 msgid ""
 "The selected books will be <b>permanently deleted</b> from your device. Are "
 "you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:610
 msgid "Cannot download metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:627
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
 msgid "social metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
 msgid "covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
 msgid "metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:630
 msgid "Downloading %s for %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:654
 msgid "Failed to download some metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:656
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
 msgid "Failed to download metadata for the following:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:659
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:658
 msgid "Failed to download metadata:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:660
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:659
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:637
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:522
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:949
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:951
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
 msgid "Error"
 msgstr "خطأ"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:670
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:707
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:669
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:706
 msgid "Cannot edit metadata"
 msgstr "لا يمكن تحرير الميتاداتا"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:728
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:731
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:727
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:730
 msgid "Cannot merge books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:732
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:731
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:736
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:735
 msgid ""
 "All book formats and metadata from the selected books will be added to the "
 "<b>first selected book.</b><br><br> The second and subsequently selected "
@@ -2971,7 +3020,7 @@ msgid ""
 "proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:747
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:746
 msgid ""
 "All book formats and metadata from the selected books will be merged into "
 "the <b>first selected book</b>.<br><br>After merger the second and "
@@ -2981,99 +3030,99 @@ msgid ""
 "from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:759
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:758
 msgid ""
 "You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
 "proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:876
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:875
 msgid "Cannot save to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:878
 msgid "Choose destination directory"
 msgstr "إختيار دليل الوجهة"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:912
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:911
 msgid "Error while saving"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:913
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:912
 msgid "There was an error while saving."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:919
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:920
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:921
 msgid "Could not save some books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:922
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:921
 msgid "Click the show details button to see which ones."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
 msgid "No books selected to generate catalog for"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:960
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:959
 msgid "Generating %s catalog..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:965
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:964
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:264
 msgid "No books found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:966
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:965
 msgid ""
 "No books to catalog\n"
 "Check exclude tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:976
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:975
 msgid "Catalog generated."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:979
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:978
 msgid "Export Catalog Directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:980
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:979
 msgid "Select destination for %s.%s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:996
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:995
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1009
 msgid " fetched."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1059
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1058
 msgid "Cannot convert"
 msgstr "لا يمكن تحويله"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1088
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1087
 msgid "Starting conversion of %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1265
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1264
 msgid "Cannot view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1209
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
 msgid "Choose the format to view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1218
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1217
 msgid "Multiple Books Selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1219
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1218
 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 "
@@ -3081,11 +3130,11 @@ msgid ""
 "continue?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1227
 msgid "Cannot open folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1266
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1265
 msgid "%s has no available formats."
 msgstr ""
 
@@ -3110,7 +3159,7 @@ msgid "The specified directory could not be processed."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:845
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:840
 msgid "No books"
 msgstr ""
 
@@ -3234,15 +3283,15 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:52
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:633
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:637
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:366
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:371
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:385
@@ -3266,12 +3315,12 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:265
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:186
@@ -3301,8 +3350,9 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:313
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1059
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1065
 msgid "Path"
 msgstr "المسار"
 
@@ -3319,8 +3369,8 @@ msgid "Formats"
 msgstr "التهيئات"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:25
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:886
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1062
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:891
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1068
 msgid "Collections"
 msgstr ""
 
@@ -3333,12 +3383,12 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:305
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:311
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:317
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1068
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1072
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1074
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:458
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:467
 msgid "None"
 msgstr "بدون"
 
@@ -4399,11 +4449,11 @@ msgid ""
 "href=\"http://calibre-ebook.com/user_manual/xpath.html\">XPath Tutorial</a>."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:127
 msgid "Cover browser could not be loaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:179
 msgid "Browse by covers"
 msgstr ""
 
@@ -4593,128 +4643,124 @@ msgstr "الجهاز: "
 msgid " detected."
 msgstr " تم كشفه."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:778
-msgid "Connected "
-msgstr "متصل "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:846
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:851
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:846
 msgid "Choose format to send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:860
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:855
 msgid "No device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:856
 msgid "Cannot send: No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:868
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:859
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:863
 msgid "No card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:869
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:860
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:910
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:905
 msgid "E-book:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:913
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:908
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:909
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:181
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:915
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:910
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:928
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:923
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:958
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:965
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1057
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1118
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1236
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:953
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:961
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1053
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1115
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1234
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1242
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:959
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:954
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:966
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:962
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:984
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:980
 msgid "Failed to email books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:985
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:981
 msgid "Failed to email the following books:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:989
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:985
 msgid "Sent by email:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1016
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1012
 msgid "News:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1017
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1013
 msgid "Attached is the"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1028
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1024
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1058
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1237
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1054
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1235
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1087
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1084
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1150
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1148
 msgid "Sending news to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1201
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1244
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1243
 msgid ""
 "Could not upload the following books to the device, as no suitable formats "
 "were found. Convert the book(s) to a format supported by your device first."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1305
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1304
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1306
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1305
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -4752,7 +4798,7 @@ msgid "My Books"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:69
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:289
 msgid "Generate catalog"
 msgstr ""
 
@@ -4887,157 +4933,157 @@ msgstr ""
 msgid "Narrow"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:503
 msgid "System port selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:503
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:504
 msgid ""
 "The value <b>%d</b> you have chosen for the content server port is a system "
 "port. Your operating system <b>may</b> not allow the server to run on this "
 "port. To be safe choose a port number larger than 1024."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:524
 msgid "Failed to install command line tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:527
 msgid "Command line tools installed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:528
 msgid "Command line tools installed in"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:529
 msgid ""
 "If you move calibre.app, you have to re-install the command line tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:580
 msgid "No valid plugin path"
 msgstr "مسار الملحق غير صالح"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:581
 msgid "%s is not a valid plugin path"
 msgstr "%s ليس مسار لملحق صالح"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:584
 msgid "Choose plugin"
 msgstr "إختيار الملحق"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:596
 msgid "Plugin cannot be disabled"
 msgstr "لا يمكن تعطيل الملحق"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:597
 msgid "The plugin: %s cannot be disabled"
 msgstr "الملحق: %s لا يمكن تعطيله"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:606
 msgid "Plugin not customizable"
 msgstr "لا يمكن تخصيص الملحق"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:607
 msgid "Plugin: %s does not need customization"
 msgstr "الملحق: %s لا يحتاج التخصيص"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:615
 msgid "Customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:652
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:653
 msgid "Cannot remove builtin plugin"
 msgstr "لم يمكن حذف الملحق المضمن"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:653
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:654
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr " لا يمكن حذفه. هذا ملحق مضمن في البرنامج. حاول تعطيله بدلاً من حذفه."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:684
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:685
 msgid "You must select a column to delete it"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:690
 msgid "The selected column is not a custom column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:690
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:691
 #: /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/config/__init__.py:691
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:692
 msgid "Do you really want to delete column %s and all its data?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:758
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:759
 msgid "Error log:"
 msgstr "سجل الأخطاء:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:765
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:766
 msgid "Access log:"
 msgstr "سجل النفاذ:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:793
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:794
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:332
 msgid "Failed to start content server"
 msgstr "فشل في تشغيل خادم المحتوى"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:817
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:818
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:587
 msgid "Select location for books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:824
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:825
 msgid "Invalid size"
 msgstr "حجم غير صالح"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:825
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:826
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:884
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:889
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:891
 msgid "Invalid database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:885
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:887
 msgid "Invalid database location "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:888
 msgid "<br>Must be a directory."
 msgstr "<br>يجب أن يكون دليل."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:890
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:892
 msgid "Invalid database location.<br>Cannot write to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:895
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:897
 msgid "Must restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:896
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:898
 msgid ""
 "The changes you made require that Calibre be restarted. Please restart as "
 "soon as practical."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:930
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:932
 msgid "Checking database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:950
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:952
 msgid "Failed to check database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:957
 msgid "Some inconsistencies found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:956
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:958
 msgid ""
 "The following books had formats listed in the database that are not actually "
 "available. The entries for the formats have been removed. You should check "
@@ -5165,296 +5211,300 @@ msgstr ""
 msgid "Sending to &device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:167
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr "التفضيلات"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
 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/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
 msgid "Browse for the new database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
 msgid "Show notification when &new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
 msgid "Download &social metadata (tags/ratings/etc.) by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
 msgid "&Overwrite author and title by default when fetching metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
 msgid "Default network &timeout:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
 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/config_ui.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
 msgid " seconds"
 msgstr " ثانية"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
 msgid "Choose &language (requires restart):"
 msgstr "إختر ال&لغة (يحتاج إعادة تشغيل):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
 msgid "Normal"
 msgstr "عادي"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
 msgid "High"
 msgstr "مرتفع"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
 msgid "Low"
 msgstr "منخفض"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
 msgid "Job &priority:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
 msgid "Preferred &output format:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
 msgid "Preferred &input format order:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
 msgid "Use &Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
 msgid "Show &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
 msgid "Show &average ratings in the tags browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
 msgid "Search as you type"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr "إرسال الأخبار& التي تم تنزيلها آلياً إلى قارئ الكتب الإلكترونية"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
 msgid "&Delete news from library when it is automatically sent to reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
 msgid "Toolbar"
 msgstr "شريط الأدوات"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
 msgid "Large"
 msgstr "كبير"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
 msgid "Medium"
 msgstr "متوسط"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
 msgid "Small"
 msgstr "صغير"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
 msgid "&Button size in toolbar"
 msgstr "&حجم الأزرار على شريط الأدوات"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
 msgid "Show &text in toolbar buttons"
 msgstr "إظهار النص& على أزرار شريط الأدوات"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
 msgid "Select visible &columns in library view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
 msgid "Remove a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
 msgid "Add a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
 msgid "Edit settings of a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
 msgid "Use internal &viewer for:"
 msgstr "استخدم المستعرض& الداخلي في:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
 msgid "User Interface &layout (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
 msgid "Disable &animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
-msgid "Add an email address to which to send books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
-msgid "&Add email"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
-msgid "Make &default"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
-msgid "&Remove email"
+msgid "Show &donate button (restart)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
+msgid "Add an email address to which to send books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
+msgid "&Add email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
+msgid "Make &default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
+msgid "&Remove email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
 msgid ""
 "calibre can send your books to you (or your reader) by email. Emails will be "
 "automatically sent for downloaded news to all email addresses that have Auto-"
 "send checked."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
 msgid "&Maximum number of waiting worker processes (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
 msgid "&Check database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
 msgid "&Install command line tools"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
 msgid "Open calibre &configuration directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
 msgid "Limit the max. simultaneous jobs to the available CPU &cores"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
 msgid "Debug &device detection"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
 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/config_ui.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
 msgid "Server &port:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:212
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:117
 msgid "&Username:"
 msgstr "&اسم المستخدم:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:213
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:119
 msgid "&Password:"
 msgstr "&كلمة السرّ"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
 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/config_ui.py:615
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
 msgid "Max. &cover size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:621
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:214
 msgid "&Show password"
 msgstr "إظهار& كلمة السرّ"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
 msgid "Max. &OPDS items per query:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
 msgid "Max. OPDS &ungrouped items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
 msgid "&Start Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:621
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
 msgid "St&op Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:626
 msgid "&Test Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
 msgid "Run server &automatically on startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:628
 msgid "View &server logs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:46
 msgid ""
 "<p>Remember to leave calibre running as the server only runs as long as "
@@ -5465,33 +5515,33 @@ msgid ""
 "the IP address of the computer calibre is running on."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:631
 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/config_ui.py:628
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:632
 msgid "Enable/&Disable plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:633
 msgid "&Customize plugin"
 msgstr "ت&خصيص الملحق"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:630
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:634
 msgid "&Remove plugin"
 msgstr "&حذف الملحق"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:635
 msgid "Add new plugin"
 msgstr "إضافة ملحق جديد"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:632
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:636
 msgid "Plugin &file:"
 msgstr "&ملف الملحق:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:634
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:638
 msgid "&Add"
 msgstr "&إضافة"
 
@@ -5529,9 +5579,9 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:31
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:884
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:889
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Date"
 msgstr "تاريخ"
@@ -5723,12 +5773,18 @@ msgstr ""
 msgid "ERROR"
 msgstr "خطأ"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:67
+msgid ""
+"All checked books will be <b>permanently deleted</b> from your device. "
+"Please verify the list."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 msgid "Location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1058
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1064
 msgid "Format"
 msgstr "التهيئة"
 
@@ -6531,6 +6587,10 @@ msgstr ""
 msgid "Add tag to available tags and apply it to current book"
 msgstr "إضافة وسم إلى قائمة الوسوم المتوفرة وعلّم الكتاب الحالي به"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:20
+msgid "%s (was %s)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:501
 msgid "Item is blank"
@@ -6865,146 +6925,162 @@ msgstr ""
 msgid "Save single format to disk..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:53
 msgid "Edit metadata individually"
 msgstr "تحرير الميتاداتا فردياً"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:56
 msgid "Edit metadata in bulk"
 msgstr "تحرير الميتاداتا جملةً"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:59
 msgid "Download metadata and covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:62
 msgid "Download only metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:64
 msgid "Download only covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:67
 msgid "Download only social metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:73
 msgid "Merge into first selected book - delete others"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:76
 msgid "Merge into first selected book - keep others"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:84
 msgid "Add books from a single directory"
 msgstr "إضافة كتب من دليل واحد"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:86
 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/init.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:90
 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/init.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:93
 msgid "Add Empty book. (Book entry with no formats)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:102
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
 msgid "Save to disk"
 msgstr "حفظ إلى القرص"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Save to disk in a single directory"
 msgstr "حفظ إلى القرص في دليل واحد"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:106
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:402
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:394
 msgid "Save only %s format to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:110
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:397
 msgid "Save only %s format to disk in a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:119
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
 msgid "View"
 msgstr "عرض"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:121
 msgid "View specific format"
 msgstr "عرض تهيئة معينة"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:127
 msgid "Remove selected books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:129
 msgid "Remove files of a specific format from selected books.."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:132
 msgid "Remove all formats from selected books, except..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:135
 msgid "Remove covers from selected books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:138
 msgid "Remove matching books from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:155
 msgid "Convert individually"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:157
 msgid "Bulk convert"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:161
 msgid "Create catalog of books in your calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:169
 msgid "Run welcome wizard"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:205
 msgid "Similar books..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:237
 msgid "Add books to library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:234
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:241
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:253
 msgid "Manage collections"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:328
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:333
 msgid "Cover Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:351
 msgid "Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:372
+msgid "version"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:373
+msgid "created by Kovid Goyal"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:391
+msgid "Connected "
+msgstr "متصل "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:400
+msgid "Update found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:454
 msgid "Book Details"
 msgstr ""
 
@@ -7088,29 +7164,29 @@ msgid "Rating"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:324
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1084
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr "كتاب <font face=\"serif\">%s</font> لـ%s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:674
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1176
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1182
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:886
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:885
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:890
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1156
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1162
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1165
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr ""
 
@@ -7154,11 +7230,11 @@ msgstr ""
 msgid "Restore default layout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:524
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:525
 msgid "Not allowed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:526
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
@@ -7355,155 +7431,163 @@ msgstr ""
 msgid "try deleting the file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:247
 msgid "calibre"
 msgstr "كاليبر"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:249
 msgid "&Restrict to:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:250
 msgid ""
 "Books display will be restricted to those matching the selected saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:251
 msgid "set in ui.py"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:252
 msgid "Advanced search"
 msgstr "بحث متقدّم"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
 msgid "Alt+S"
 msgstr "Alt+S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
 msgid "&Search:"
 msgstr "&بحث:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
 msgid ""
 "<p>Search the list of books by title, author, publisher, tags, comments, "
 "etc.<br><br>Words separated by spaces are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
 msgid "Reset Quick Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
-msgid "Choose saved search or enter name for new saved search"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
 msgid "Copy current search text (instead of search name)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
 msgid "Save current search under the name shown in the box"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
 msgid "Delete current saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
 msgid "Add books"
 msgstr "إضافة كتب"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
 msgid "A"
 msgstr "A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
 msgid "Remove books"
 msgstr "حذف كتب"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
 msgid "Del"
 msgstr "Del"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
 msgid "Edit meta information"
 msgstr "تحرير معلومات الميتا"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
 msgid "E"
 msgstr "E"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
 msgid "Merge book records"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
 msgid "M"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
 msgid "Send to device"
 msgstr "إرسال لجهاز"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
 msgid "S"
 msgstr "S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
 msgid "Fetch news"
 msgstr "احصل على الأخبار"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
 msgid "Convert E-books"
 msgstr "تحويل الكتاب الإلكتروني"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
 msgid "C"
 msgstr "C"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
 msgid "V"
 msgstr "V"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
 msgid "Open containing folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
 msgid "Show book details"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
 msgid "Books by same author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
 msgid "Books in this series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
 msgid "Books by this publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
 msgid "Books with the same tags"
 msgstr "كتب بنفس الوسوم"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
 msgid "Configure calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
 msgid "Ctrl+P"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
+msgid "Help"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
+msgid "Browse the calibre User Manual"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
+msgid "F1"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:20
 msgid ""
 "Redirect console output to a dialog window (both stdout and stderr). Useful "
@@ -7530,32 +7614,36 @@ msgstr ""
 msgid "No matches found for this book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:91
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:262
 msgid "Search"
 msgstr "بحث"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:313
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:315
 msgid "The selected search will be <b>permanently deleted</b>. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:357
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:392
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:398
 msgid "Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:406
+msgid "Choose saved search or enter name for new saved search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:47
 msgid "({0} of {1})"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:53
 msgid "(all books)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:55
 msgid "({0} of all)"
 msgstr ""
 
@@ -7678,18 +7766,31 @@ msgstr ""
 msgid "Sort by average rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:775
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:772
+msgid "Set the sort order for entries in the Tag Browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:778
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:775
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:778
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:783
+msgid ""
+"When selecting multiple entries in the Tag Browser match any or all of them"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:787
 msgid "Manage &user categories"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:790
+msgid "Add your own categories to the Tag Browser"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182
 msgid "Convert book %d of %d (%s)"
@@ -7715,15 +7816,15 @@ msgstr ""
 msgid "Queueing "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:239
 msgid "Fetch news from "
 msgstr "احصل على الأخبار من "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:301
 msgid "Convert existing"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:302
 msgid ""
 "The following books have already been converted to %s format. Do you wish to "
 "reconvert them?"
@@ -7737,104 +7838,91 @@ msgstr ""
 msgid "&Donate to support calibre"
 msgstr "تبرع& لدعم كاليبر"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:168
 msgid "&Eject connected device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:173
 msgid "&Restart"
 msgstr "إعادة تشغيل&"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:206
-msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:212
-msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:227
 msgid "Calibre Quick Start Guide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:389
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:381
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:377
 msgid "Cannot configure while there are running jobs."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:382
 msgid "Cannot configure before calibre is restarted."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:425
 msgid "No detailed info available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:426
 msgid "No detailed information is available for books on the device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:486
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:478
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:506
 msgid "Conversion Error"
 msgstr "خطأ في التحويل"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:487
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:479
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using third party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:492
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:507
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:547
 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."
+"you find it useful, please consider donating to support its development. "
+"Your donation helps keep calibre development going."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:573
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:576
 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/ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:640
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:633
 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/update.py:52
-msgid ""
-"<span style=\"color:red; font-weight:bold\">Latest version: <a "
-"href=\"%s\">%s</a></span>"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/update.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:56
 msgid "Update available"
 msgstr "تحديث متوفر"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/update.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:57
 msgid ""
 "%s has been updated to version %s. See the <a href=\"http://calibre-"
 "ebook.com/whats-new\">new features</a>. Visit the download page?"
@@ -8312,29 +8400,25 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:270
 msgid ""
 "Library\n"
-"%d\n"
-"books"
+"%d books"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:271
 msgid ""
 "Reader\n"
-"%s\n"
-"available"
+"%s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:272
 msgid ""
 "Card A\n"
-"%s\n"
-"available"
+"%s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:273
 msgid ""
 "Card B\n"
-"%s\n"
-"available"
+"%s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:277
@@ -8357,35 +8441,39 @@ msgstr ""
 msgid "Books located at"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:306
+msgid "free"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:557
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:558
 msgid "Upper Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:559
 msgid "Lower Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:560
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:561
 msgid "Title Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:974
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:983
 msgid "Drag to resize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1015
 msgid "Show"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1012
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1022
 msgid "Hide"
 msgstr ""
 
@@ -9657,89 +9745,89 @@ msgstr ""
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:706
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:708
 msgid "Download finished"
 msgstr "تم التنزيل"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:708
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:710
 msgid "Failed to download the following articles:"
 msgstr "فشل تنزيل المقالات التالية:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:714
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:716
 msgid "Failed to download parts of the following articles:"
 msgstr "فشل تنزيل أجزاء من المقالات التالية:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:716
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:718
 msgid " from "
 msgstr " من "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:718
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:720
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:807
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:809
 msgid "Could not fetch article. Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:828
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:830
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:833
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:835
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:839
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:841
 msgid "Trying to download cover..."
 msgstr "محاولة تنزيل الغلاف..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:841
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:922
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:924
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:938
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:940
 msgid "Feeds downloaded to %s"
 msgstr "تم تنزيل التلقيم إلى %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:948
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:950
 msgid "Could not download cover: %s"
 msgstr "لم يتمكّن من تنزيل الغلاف: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:960
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
 msgid "Downloading cover from %s"
 msgstr "يتم تنزيل الغلاف من %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1002
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1190
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1192
 msgid "Untitled Article"
 msgstr "مقالة بدون عنوان"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1261
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1263
 msgid "Article downloaded: %s"
 msgstr "المقالة منزّلة: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1272
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1274
 msgid "Article download failed: %s"
 msgstr "فشل تنزيل المقالة: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1289
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1291
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1436
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1438
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1452
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1454
 msgid ""
 "You do not have permission to download this issue. Either your subscription "
 "has expired or you have exceeded the maximum allowed downloads for today."
diff --git a/src/calibre/translations/ca.po b/src/calibre/translations/ca.po
index 36c2679df4..18670fb209 100644
--- a/src/calibre/translations/ca.po
+++ b/src/calibre/translations/ca.po
@@ -10,19 +10,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ca\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-03 01:21+0000\n"
-"PO-Revision-Date: 2010-07-05 07:09+0000\n"
-"Last-Translator: Fike <Unknown>\n"
+"POT-Creation-Date: 2010-07-10 16:12+0000\n"
+"PO-Revision-Date: 2010-07-10 10:18+0000\n"
+"Last-Translator: sefirotsama <sefirotsama@gmail.com>\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: 2010-07-06 03:36+0000\n"
+"X-Launchpad-Export-Date: 2010-07-11 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
 msgid "Does absolutely nothing"
-msgstr "No fa absolutament res"
+msgstr "No en fa absolutament res"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:72
@@ -30,10 +30,10 @@ msgstr "No fa absolutament res"
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:71
 #: /home/kovid/work/calibre/src/calibre/devices/prs500/books.py:267
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:466
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:396
-#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:98
-#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:101
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:492
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:398
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:97
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:100
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/metadata.py:56
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:428
 #: /home/kovid/work/calibre/src/calibre/ebooks/fb2/input.py:67
@@ -75,9 +75,9 @@ msgstr "No fa absolutament res"
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:818
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:49
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:51
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:910
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:915
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:981
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:911
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:916
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:982
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:137
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:139
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:108
@@ -105,20 +105,20 @@ msgstr "No fa absolutament res"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:233
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:290
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:815
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:818
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:814
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:817
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:172
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:179
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:22
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:135
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:903
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:912
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1192
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1195
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:899
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:908
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1191
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1194
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:120
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:155
@@ -126,8 +126,8 @@ msgstr "No fa absolutament res"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:172
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:362
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:877
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1054
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:882
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1060
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:87
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:92
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:185
@@ -163,27 +163,27 @@ msgstr "Tipus de fitxer"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:206
 msgid "Metadata reader"
-msgstr "Lector de metadades"
+msgstr "Lector de metainformació"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:235
 msgid "Metadata writer"
-msgstr "Escriptor de metadades"
+msgstr "Escriptor de metainformació"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:263
 msgid "Catalog generator"
 msgstr "Generador del Catàleg"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:15
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:16
 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 ""
 "Segueix tots els enllaços locals en un fitxer HTML i crea un arxiu ZIP que "
-"contingui els fitxers enllaçats. Aquest connector s'executat cada vegada que "
+"contingui els fitxers enllaçats. Aquest connector s'executa cada vegada que "
 "s'afegeix un fitxer HTML a la biblioteca."
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:51
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:52
 msgid ""
 "Character encoding for the input HTML files. Common choices include: cp1252, "
 "latin1, iso-8859-1 and utf-8."
@@ -191,7 +191,7 @@ msgstr ""
 "El joc de caràcters dels fitxer HTML d'entrada. Les opcions comuns inclouen: "
 "cp1252, latin1, iso-8859-1 i utf-8."
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:58
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:59
 msgid ""
 "Create a PMLZ archive containing the PML file and all images in the "
 "directory pmlname_img or images. This plugin is run every time you add a PML "
@@ -201,51 +201,51 @@ msgstr ""
 "directoris pmlname_ing o images. Aquest connector s'executa cada vegada que "
 "afegiu un fitxer PML a la biblioteca."
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:90
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:93
 msgid "Extract cover from comic files"
 msgstr "Extreu la portada dels fitxers de còmic"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:117
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:128
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:140
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:150
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:160
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:171
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:181
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:191
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:201
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:211
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:221
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:232
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:243
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:255
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:276
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:287
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:297
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:307
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:120
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:131
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:153
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:163
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:174
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:184
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:194
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:204
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:214
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:224
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:235
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:246
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:258
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:279
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:290
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:300
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:310
 msgid "Read metadata from %s files"
-msgstr "Llegeix les metadades dels fitxers %s"
+msgstr "Llegeix la metainformació dels fitxers %s"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:266
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:269
 msgid "Read metadata from ebooks in RAR archives"
-msgstr "Llegeix les metadades dels llibres electrònics en arxius RAR"
+msgstr "Llegeix la metainformació dels llibres electrònics en arxius RAR"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:318
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:321
 msgid "Read metadata from ebooks in ZIP archives"
-msgstr "Llegeix les metadades dels llibres electrònics en arxius ZIP"
+msgstr "Llegeix la metainformació dels llibres electrònics en arxius ZIP"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:331
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:341
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:351
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:373
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:384
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:394
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:334
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:344
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:354
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:376
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:387
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:397
 msgid "Set metadata in %s files"
-msgstr "Estableix metadades als fitxers %s"
+msgstr "Estableix la metainformació als fitxers %s"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:362
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:365
 msgid "Set metadata from %s files"
-msgstr "Estableix metadades des dels fitxers %s"
+msgstr "Estableix metainformació des dels fitxers %s"
 
 #: /home/kovid/work/calibre/src/calibre/customize/conversion.py:102
 msgid "Conversion Input"
@@ -258,10 +258,10 @@ msgid ""
 "useful for documents that do not declare an encoding or that have erroneous "
 "encoding declarations."
 msgstr ""
-"Especifiqueu el joc de caràcters del document d'entrada. Aquesta opció té "
-"preferència a qualsevol altre joc de caràcters que pugui estar indicat al "
+"Especifiqueu el joc de caràcters del document d'entrada. Aquesta opció "
+"sobreescriurà qualsevol altre joc de caràcters que pugui estar indicat al "
 "document. És particularment útil per a documents que no indiquen cap joc de "
-"caràcters o ho fan incorrectamen."
+"caràcters o ho fan incorrectament."
 
 #: /home/kovid/work/calibre/src/calibre/customize/conversion.py:241
 msgid "Conversion Output"
@@ -404,35 +404,35 @@ msgstr ""
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr "Aquest perfil és adient per a l'Amazon Kindle DX."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:31
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
 msgid "Installed plugins"
 msgstr "Connectors instal·lats"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:33
 msgid "Mapping for filetype plugins"
 msgstr "Associació per a connectors de tipus de fitxers"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:33
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:34
 msgid "Local plugin customization"
 msgstr "Personalització del connector local"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:34
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
 msgid "Disabled plugins"
 msgstr "Connectors inhabilitats"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
 msgid "Enabled plugins"
 msgstr "Connectors permesos"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:83
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:84
 msgid "No valid plugin found in "
 msgstr "No s'ha trobat cap connector vàlid a "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:460
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:468
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr "No s'ha pogut inicialitzar el connector %s i s'ha generat la traça:"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:493
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
 msgid ""
 "    %prog options\n"
 "\n"
@@ -444,18 +444,18 @@ msgstr ""
 "    Personalitzeu el calibre carregant connectors externs.\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:499
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr ""
 "Afegeix un connector especificiant el camí al fitxer ZIP que el conté"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 "Suprimeix un connector personalitzat per nom. No té cap efecte als "
 "complements integrats"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:503
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:511
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
@@ -463,15 +463,15 @@ msgstr ""
 "Personalitza el connector. Especifiqueu el nom del connector i el text que "
 "desitgeu, separats per una coma."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:505
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:513
 msgid "List all installed plugins"
 msgstr "Fes una llista amb tots els connectors instal·lats"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Enable the named plugin"
 msgstr "Habilita el connector anomenat"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Disable the named plugin"
 msgstr "Inhabilita el connector anomenat"
 
@@ -522,11 +522,11 @@ msgstr "finalitzat"
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:544
 msgid "Use Series as Category in iTunes/iBooks"
-msgstr ""
+msgstr "Fes servir Sèries com a categoria a l'iTunes/iBooks"
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:546
 msgid "Cache covers from iTunes/iBooks"
-msgstr ""
+msgstr "Cau de caràtules des de l'iTunes/iBooks"
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:558
 msgid ""
@@ -636,7 +636,7 @@ msgstr ""
 msgid "Communicate with the BOOX eBook reader."
 msgstr "Estableix comunicació amb el lector de llibres electrònics BOOX."
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:121
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:123
 msgid ""
 "Comma separated list of directories to send e-books to on the device. The "
 "first one that exists will be used."
@@ -718,34 +718,34 @@ msgstr "Comunica amb el lector Kobo Reader"
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:51
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:54
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:57
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:157
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:159
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:64
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:67
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:70
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:130
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:137
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:160
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:139
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:162
 msgid "Getting list of books on device..."
 msgstr "S'està obtenint el llistat de llibres disponibles al dispositiu..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:218
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:258
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:244
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:262
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:219
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:263
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:246
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:264
 msgid "Removing books from device..."
 msgstr "S'estan suprimint  els llibres del dispositiu..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:262
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:269
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:269
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:274
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:267
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:274
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:271
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:276
 msgid "Removing books from device metadata listing..."
 msgstr "S'estan suprimint llibres del llistat de metadades del dispositiu..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:274
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:308
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:208
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:238
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:313
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:210
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:240
 msgid "Adding books to device metadata listing..."
 msgstr "S'estan afegint llibres al llistat de metadades del dispositiu..."
 
@@ -761,6 +761,10 @@ msgstr "Comunicar-se amb Booq Avant"
 msgid "Communicate with the Sweex MM300"
 msgstr "Comunicar-se amb el Sweex MM300"
 
+#: /home/kovid/work/calibre/src/calibre/devices/misc.py:75
+msgid "Communicate with the Pandigital Novel"
+msgstr "Comunicar-se amb el Pandigital Novel"
+
 #: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:17
 msgid "Communicate with the Nokia 770 internet tablet."
 msgstr "Estableix comunicació amb la tauleta d'Internet Nokia 770."
@@ -913,12 +917,12 @@ msgstr "Estableix comunicació amb el lector de llibres electrònics."
 msgid "Get device information..."
 msgstr "Obté informació del dispositiu..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:188
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:192
 msgid "Transferring books to device..."
 msgstr "S'estan transferint llibres al dispositiu..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:305
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:307
 msgid "Sending metadata to device..."
 msgstr "S'estan enviant metadades al dispositiu..."
 
@@ -1700,6 +1704,59 @@ msgstr "S'estàn transformant el llibre electrònic..."
 msgid "Creating"
 msgstr "S'està creant"
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/__init__.py:18
+msgid "ePub Fixer"
+msgstr "Reparador d'ePub"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/epubcheck.py:18
+msgid "Workaround epubcheck bugs"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/epubcheck.py:22
+msgid ""
+"Workarounds for bugs in the latest release of epubcheck. epubcheck reports "
+"many things as errors that are not actually errors. epub-fix will try to "
+"detect these and replace them with constructs that epubcheck likes. This may "
+"cause significant changes to your epub, complain to the epubcheck project."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:19
+msgid ""
+"%prog [options] file.epub\n"
+"\n"
+"Fix common problems in EPUB files that can cause them to be rejected by "
+"poorly designed publishing services.\n"
+"\n"
+"By default, no fixing is done and messages are printed out for each error "
+"detected. Use the options to control which errors are automatically fixed."
+msgstr ""
+"%prog [opcions] fitxer.epub\n"
+"\n"
+"Arregla els problemes més comuns als fitxers EPUB que poden causar ésser "
+"rebutjats per un servei de publicació amb pobre disseny.\n"
+"\n"
+"De manera predeterminada, no arreglant és correcte i els missatges són "
+"impresos per cada error detectat. Faci servir les opcions per controlar "
+"quins errors han estat automàticament arreglats."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:50
+msgid "You must specify an epub file"
+msgstr "Ha d'especificar un fitxer epub."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:17
+msgid "Fix unmanifested files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:21
+msgid ""
+"Fix unmanifested files. epub-fix can either add them to the manifest or "
+"delete them as specified by the delete unmanifested option."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:32
+msgid "Delete unmanifested files instead of adding them to the manifest"
+msgstr "Elimina arxius no manifestats enlloc de afegir-los al manifest"
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:56
 msgid ""
 "Extract the contents of the generated EPUB file to the specified directory. "
@@ -1751,6 +1808,10 @@ msgid ""
 "JetBook Lite. Without this option, such devices will display the cover as a "
 "blank page."
 msgstr ""
+"No fer servir una caràtula SVG. Faci servir aquesta opció si el seu EPUB "
+"serà fet servir a un dispositiu que no té suport per a SVG, com per exemple "
+"l'iPhone o bé JetBook Lite. Sense aquesta opció, aquests dispositius "
+"mostrarà la caràtula com una pàgina en blanc."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:94
 msgid ""
@@ -2068,11 +2129,11 @@ msgstr "Còmic"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:98
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:882
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:887
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:543
 msgid "Title"
 msgstr "Tí­tol"
@@ -2081,7 +2142,7 @@ msgstr "Tí­tol"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:364
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:883
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:888
 msgid "Author(s)"
 msgstr "Autor(s)"
 
@@ -2104,7 +2165,7 @@ msgstr "Productor"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:67
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:318
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1073
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1079
 msgid "Comments"
 msgstr "Comentaris"
 
@@ -2113,7 +2174,7 @@ msgstr "Comentaris"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:306
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1069
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1075
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:139
 msgid "Tags"
 msgstr "Etiquetes"
@@ -2123,7 +2184,7 @@ msgstr "Etiquetes"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:323
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1084
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:87
 msgid "Series"
 msgstr "Sèries"
@@ -2133,7 +2194,7 @@ msgid "Language"
 msgstr "Llengua"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:406
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1067
 msgid "Timestamp"
 msgstr "Marca de temps"
 
@@ -2226,12 +2287,15 @@ msgstr "Establir la data de publicació."
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:77
 msgid "Get the cover from the ebook and save it at as the specified file."
 msgstr ""
+"Aconsegueix caràtules del ebook i guarda-les com el fitxer especificat."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:80
 msgid ""
 "Specify the name of an OPF file. The metadata will be written to the OPF "
 "file."
 msgstr ""
+"Especifica el nom d'un fitxer OPF. La metainformació  serà escrita juntament "
+"al fitxer OPF."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:83
 msgid ""
@@ -2239,6 +2303,9 @@ msgid ""
 "ebook. Metadata specified on the command line will override metadata read "
 "from the OPF file"
 msgstr ""
+"Llegeix la metainformació des d'un fitxer OPF específic i la fa servir com a "
+"metainfornació al ebook. La metainformació especificada a la línia d'ordres "
+"serà sobreescriurà la metainformació llegida del fitxer OPF."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:88
 msgid "Set the BookID in LRF files"
@@ -2270,11 +2337,11 @@ msgstr "No s'ha trobat cap caràtula"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/covers.py:15
 msgid "Cover download"
-msgstr ""
+msgstr "Caràtula descarregada."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/douban.py:42
 msgid "Downloads metadata from Douban.com"
-msgstr ""
+msgstr "Descarrega metainformació des de Douban.com"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:34
 msgid "Metadata download"
@@ -2290,19 +2357,19 @@ msgstr "etiquetes"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:112
 msgid "description/reviews"
-msgstr ""
+msgstr "Descripció/sinopsis"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:113
 msgid "Download %s from %s"
-msgstr ""
+msgstr "Descarrega %s des de %s"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:139
 msgid "Downloads metadata from Google Books"
-msgstr ""
+msgstr "Descarrega metainformació des de Google Books."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:156
 msgid "Downloads metadata from isbndb.com"
-msgstr ""
+msgstr "Descarrega metainformació des de isbndb.com"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:184
 msgid ""
@@ -2312,11 +2379,13 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:194
 msgid "Downloads social metadata from amazon.com"
-msgstr ""
+msgstr "Descarrega metainformació social des d'amazon.com"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:213
 msgid "Downloads series/tags/rating information from librarything.com"
 msgstr ""
+"Descarrega informació de series, etiquetes i qualificacions des de "
+"librarything.com"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:95
 msgid ""
@@ -2331,40 +2400,53 @@ msgid ""
 "isbndb.com.\n"
 "\n"
 msgstr ""
+"\n"
+"%prog [opcions] clau\n"
+"\n"
+"Obté metainformació de llibres des de isndb.com. Pot especificar "
+"l'identificador ISBN del llibre o bé el seu títol i autor. Si vostè "
+"especifica el títol i l'autor, serà retornat més d'un llibre.\n"
+"\n"
+"La clau, és la clau del compte que vostè genera desprès de registrar-ne un "
+"compte gratuit a isbndb.com.\n"
+"\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:106
 msgid "The ISBN ID of the book you want metadata for."
 msgstr ""
+"L'identificador ISBN del llibre del qual vostè en vol la metainformació."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:108
 msgid "The author whose book to search for."
-msgstr ""
+msgstr "L'autor del llibre el qual vostè  ha cercat."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:110
 msgid "The title of the book to search for."
-msgstr ""
+msgstr "El títol del llibre el qual vostè ha cercat."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:112
 msgid "The publisher of the book to search for."
-msgstr ""
+msgstr "L'editor del llibre el qual vostè ha cercat."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:68
 msgid "LibraryThing.com timed out. Try again later."
-msgstr ""
+msgstr "LibraryThing.com ha esgotat el temps. Provi-ho de nou més tard."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:75
 msgid ""
 "Could not fetch cover as server is experiencing high load. Please try again "
 "later."
 msgstr ""
+"No s'ha pogut aconseguir la caràtula, el servidor està experimentant una "
+"càrrega molt alta. Si us plau, provi-ho de nou més tard."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:76
 msgid " not found."
-msgstr ""
+msgstr " no trobat."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:79
 msgid "LibraryThing.com server error. Try again later."
-msgstr ""
+msgstr "Error al servidor LibraryThing.com. Provi-ho de nou més tard."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:86
 msgid ""
@@ -2374,30 +2456,39 @@ msgid ""
 "Fetch a cover image/social metadata for the book identified by ISBN from "
 "LibraryThing.com\n"
 msgstr ""
+"\n"
+"%prog [opcions] ISBN\n"
+"\n"
+"Aconsegueix una portada imatge o bé metainformació social per al llibre "
+"identificat mitjançant ISBN des de LibrqaryThing.com\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1226
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1398
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1399
 msgid "Cover"
-msgstr ""
+msgstr "Portada"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:22
 msgid "Modify images to meet Palm device size limitations."
 msgstr ""
+"Modifica les imatges per a trobar les limitacions de mida del dispositiu "
+"Palm."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:26
 msgid "When present, use author sort field as author."
-msgstr ""
+msgstr "Quan es mostri, fes servir l'autor com a camp d'autor."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:30
 msgid ""
 "Don't add Table of Contents to end of book. Useful if the book has its own "
 "table of contents."
 msgstr ""
+"No afegeixis índex al final del llibre. Útil si el llibre té el seu propi "
+"índex."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:33
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:56
 msgid "Title for any generated in-line table of contents."
-msgstr ""
+msgstr "Títol per qualsevol índex generat en línia."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:37
 msgid "Disable compression of the file contents."
@@ -2415,80 +2506,80 @@ msgstr ""
 msgid "This is an Amazon Topaz book. It cannot be processed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1399
-msgid "Title Page"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1400
+msgid "Title Page"
+msgstr "Pàgina del títol"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1401
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:15
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:53
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:194
 msgid "Table of Contents"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1401
-msgid "Index"
-msgstr ""
+msgstr "Índex"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1402
-msgid "Glossary"
-msgstr ""
+msgid "Index"
+msgstr "Índex"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1403
-msgid "Acknowledgements"
-msgstr ""
+msgid "Glossary"
+msgstr "Glossari"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1404
-msgid "Bibliography"
-msgstr ""
+msgid "Acknowledgements"
+msgstr "Reconeixements"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1405
-msgid "Colophon"
-msgstr ""
+msgid "Bibliography"
+msgstr "Bibliografia"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1406
-msgid "Copyright"
-msgstr ""
+msgid "Colophon"
+msgstr "Colofó"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1407
-msgid "Dedication"
-msgstr ""
+msgid "Copyright"
+msgstr "Drets d'autor"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1408
-msgid "Epigraph"
-msgstr ""
+msgid "Dedication"
+msgstr "Dedicatòria"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1409
-msgid "Foreword"
-msgstr ""
+msgid "Epigraph"
+msgstr "Epígraf"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1410
-msgid "List of Illustrations"
-msgstr ""
+msgid "Foreword"
+msgstr "Prefaci"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1411
-msgid "List of Tables"
-msgstr ""
+msgid "List of Illustrations"
+msgstr "Índex d'il·lustracions"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1412
-msgid "Notes"
-msgstr ""
+msgid "List of Tables"
+msgstr "Índex de taules"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1413
-msgid "Preface"
-msgstr ""
+msgid "Notes"
+msgstr "Anotacions"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1414
+msgid "Preface"
+msgstr "Pròleg"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1415
 msgid "Main Text"
-msgstr ""
+msgstr "Text principal"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/iterator.py:41
 msgid "%s format books are not supported"
-msgstr ""
+msgstr "El format de llibre %s no està suportat"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:54
 msgid "HTML TOC generation options."
-msgstr ""
+msgstr "Opcions de generació del HTML TOC."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:113
 msgid "Book Jacket"
@@ -2501,28 +2592,30 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/writer.py:32
 msgid "OPF/NCX/etc. generation options."
-msgstr ""
+msgstr "Opcions de generació OPF, NCX, etcètera."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/writer.py:35
 msgid "OPF version to generate. Default is %default."
-msgstr ""
+msgstr "Versió OPF per generar. Per defecte és %default."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/writer.py:37
 msgid ""
 "Generate an Adobe \"page-map\" file if pagination information is available."
 msgstr ""
+"Genera un fitxer Adobe \"page-map\" si la informació de paginació és "
+"disponible."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/ereader/reader132.py:128
 msgid "Footnotes"
-msgstr ""
+msgstr "Notes al peu"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/ereader/reader132.py:135
 msgid "Sidebar"
-msgstr ""
+msgstr "Barra lateral"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:22
 #: /home/kovid/work/calibre/src/calibre/ebooks/tcr/input.py:23
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:23
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:24
 msgid ""
 "Normally calibre treats blank lines as paragraph markers. With this option "
 "it will assume that every line represents a paragraph instead."
@@ -2530,7 +2623,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:26
 #: /home/kovid/work/calibre/src/calibre/ebooks/tcr/input.py:27
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:27
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:28
 msgid ""
 "Normally calibre treats blank lines as paragraph markers. With this option "
 "it will assume that every line starting with an indent (either a tab or 2+ "
@@ -2540,13 +2633,16 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/output.py:23
 msgid "Format to use inside the pdb container. Choices are:"
-msgstr ""
+msgstr "Format per a fer servir a un contenidor pdb. Les opcions son:"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/output.py:27
 msgid ""
 "Specify the character encoding of the output document. The default is "
 "cp1252. Note: This option is not honored by all formats."
 msgstr ""
+"Especifica la codificació de caràcters per a la sortida del document. La "
+"opció per defecte és cp1252. Nota: aquesta opció no és recolzada per tots "
+"els formats."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/input.py:24
 msgid "Do not extract images from the document"
@@ -2659,7 +2755,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
 msgid "Author"
 msgstr ""
@@ -2794,19 +2890,19 @@ msgid ""
 "slowest."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:33
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:34
 msgid ""
 "Normally extra spaces are condensed into a single space. With this option "
 "all spaces will be displayed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:36
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:37
 msgid ""
 "Run the text input through the markdown pre-processor. To learn more about "
 "markdown see"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:39
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:40
 msgid "Do not insert a Table of Contents into the output text."
 msgstr ""
 
@@ -2968,7 +3064,7 @@ msgstr ""
 msgid "Copy to Clipboard"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:400
 msgid "Choose Files"
 msgstr ""
 
@@ -2983,13 +3079,13 @@ msgid "User annotations generated from main library only"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:75
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:612
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:671
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:708
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:729
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:877
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1060
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:670
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:707
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:728
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:876
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:941
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1059
 msgid "No books selected"
 msgstr "Cap llibre seleccionat"
 
@@ -3029,209 +3125,209 @@ msgstr ""
 msgid "How many empty books should be added?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:340
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:390
 msgid "Uploading books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:350
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:137
 msgid "Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
 msgid "EPUB Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
 msgid "LRF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
 msgid "HTML Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
 msgid "LIT Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
 msgid "MOBI Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
 msgid "Topaz books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
 msgid "Text books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:359
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
 msgid "PDF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:359
 msgid "Comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:360
 msgid "Archives"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:364
 msgid "Supported books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:399
 msgid "Merged some books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:401
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:400
 msgid ""
 "Some duplicates were found and merged into the following existing books:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:409
 msgid "Failed to read metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:410
 msgid "Failed to read metadata from the following"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:434
 msgid "Add to library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:460
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1229
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:459
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1228
 msgid "No book selected"
 msgstr "Cap llibre seleccionat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:434
 msgid "No book files found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:456
 msgid "Cannot delete"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:469
 msgid "Choose formats to be deleted"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:488
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:487
 msgid "Choose formats <b>not</b> to be deleted"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:507
 msgid "Cannot delete books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:509
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:508
 msgid "No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:519
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:518
 msgid "Main memory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:520
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:444
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:519
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:454
 msgid "Storage Card A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:521
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:446
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:455
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:447
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:456
 msgid "Storage Card B"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:525
 msgid "No books to delete"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:526
 msgid "None of the selected books are on the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:544
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:600
 msgid "Deleting books from device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:564
 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/actions.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:585
 msgid ""
 "The selected books will be <b>permanently deleted</b> from your device. Are "
 "you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:610
 msgid "Cannot download metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:627
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
 msgid "social metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
 msgid "covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
 msgid "metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:630
 msgid "Downloading %s for %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:654
 msgid "Failed to download some metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:656
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
 msgid "Failed to download metadata for the following:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:659
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:658
 msgid "Failed to download metadata:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:660
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:637
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:522
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:949
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:659
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:638
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:951
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
 msgid "Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:670
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:707
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:669
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:706
 msgid "Cannot edit metadata"
 msgstr "No puc editar les meta-dades"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:728
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:731
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:727
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:730
 msgid "Cannot merge books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:732
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:731
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:736
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:735
 msgid ""
 "All book formats and metadata from the selected books will be added to the "
 "<b>first selected book.</b><br><br> The second and subsequently selected "
@@ -3239,7 +3335,7 @@ msgid ""
 "proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:747
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:746
 msgid ""
 "All book formats and metadata from the selected books will be merged into "
 "the <b>first selected book</b>.<br><br>After merger the second and "
@@ -3249,99 +3345,99 @@ msgid ""
 "from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:759
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:758
 msgid ""
 "You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
 "proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:876
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:875
 msgid "Cannot save to disk"
 msgstr "No puc desar al disc"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:878
 msgid "Choose destination directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:912
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:911
 msgid "Error while saving"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:913
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:912
 msgid "There was an error while saving."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:919
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:920
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:921
 msgid "Could not save some books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:922
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:921
 msgid "Click the show details button to see which ones."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
 msgid "No books selected to generate catalog for"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:960
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:959
 msgid "Generating %s catalog..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:965
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:964
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:264
 msgid "No books found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:966
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:965
 msgid ""
 "No books to catalog\n"
 "Check exclude tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:976
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:975
 msgid "Catalog generated."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:979
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:978
 msgid "Export Catalog Directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:980
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:979
 msgid "Select destination for %s.%s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:996
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:995
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1009
 msgid " fetched."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1059
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1058
 msgid "Cannot convert"
 msgstr "No puc convertir-lo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1088
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1087
 msgid "Starting conversion of %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1265
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1264
 msgid "Cannot view"
 msgstr "No puc mostrar-lo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1209
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
 msgid "Choose the format to view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1218
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1217
 msgid "Multiple Books Selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1219
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1218
 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 "
@@ -3349,11 +3445,11 @@ msgid ""
 "continue?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1227
 msgid "Cannot open folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1266
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1265
 msgid "%s has no available formats."
 msgstr ""
 
@@ -3378,7 +3474,7 @@ msgid "The specified directory could not be processed."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:845
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr ""
 
@@ -3502,15 +3598,15 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:52
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:633
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:637
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:366
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:371
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:385
@@ -3534,12 +3630,12 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:259
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:265
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:186
@@ -3569,8 +3665,9 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:313
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1059
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1065
 msgid "Path"
 msgstr "Camí"
 
@@ -3587,8 +3684,8 @@ msgid "Formats"
 msgstr "Formats"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:25
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:886
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1062
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:891
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1068
 msgid "Collections"
 msgstr ""
 
@@ -3601,12 +3698,12 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:305
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:311
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:317
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1068
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1072
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1074
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:458
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:274
 msgid "None"
 msgstr "Cap"
 
@@ -4455,12 +4552,12 @@ msgid "Footer regular expression:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:56
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:76
 msgid "Invalid regular expression"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:77
 msgid "Invalid regular expression: %s"
 msgstr ""
 
@@ -4668,11 +4765,11 @@ msgid ""
 "href=\"http://calibre-ebook.com/user_manual/xpath.html\">XPath Tutorial</a>."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:127
 msgid "Cover browser could not be loaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:179
 msgid "Browse by covers"
 msgstr ""
 
@@ -4731,124 +4828,124 @@ msgstr ""
 msgid "tags to remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:49
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:135
 msgid "No details available."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:155
 msgid "Device no longer connected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:270
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:271
 msgid "Get device information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:282
 msgid "Get list of books on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:292
 msgid "Get annotations from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:301
 msgid "Send metadata to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:305
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:306
 msgid "Send collections to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:330
 msgid "Upload %d books to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:345
 msgid "Delete books from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:362
 msgid "Download books from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:372
 msgid "View book on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:408
 msgid "Set default send to device action"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:413
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:420
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:422
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:425
 msgid "Email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:425
 msgid " and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:434
 msgid "Send to main memory"
 msgstr "Envia a la memòria interna"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:436
 msgid "Send to storage card A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:437
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:438
 msgid "Send to storage card B"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:442
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:452
 msgid "Main Memory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:469
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:470
 msgid "Send and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:471
 msgid "Send specific format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:509
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:510
 msgid "Connect to folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:516
 msgid "Connect to iTunes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:521
 msgid "Eject device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:529
 msgid "Fetch annotations (experimental)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:638
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:639
 msgid "Error communicating with device"
 msgstr "Error en la comunicació amb el dispositiu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:659
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:660
 msgid "Select folder to open as device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:704
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:705
 msgid "Failed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:710
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:711
 msgid "Error talking to device"
 msgstr "Error comunicant amb el dispositiu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:711
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:712
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -4856,122 +4953,118 @@ 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/device.py:753
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:754
 msgid "Device: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:755
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:756
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:778
-msgid "Connected "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:846
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:851
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:847
 msgid "Choose format to send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:860
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:856
 msgid "No device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:857
 msgid "Cannot send: No device is connected"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:860
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:868
 msgid "No card"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:869
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:910
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:906
 msgid "E-book:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:913
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:909
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:910
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:181
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:915
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:911
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:928
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:924
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:958
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:965
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1057
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1118
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1236
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:954
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:962
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1054
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1235
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:1243
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:959
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:955
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:966
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:963
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:984
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:981
 msgid "Failed to email books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:985
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:982
 msgid "Failed to email the following books:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:989
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:986
 msgid "Sent by email:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1016
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1013
 msgid "News:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1017
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1014
 msgid "Attached is the"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1028
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1025
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1058
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1237
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1055
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1117
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1236
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1087
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1085
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1150
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1149
 msgid "Sending news to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1202
 msgid "Sending books to device."
 msgstr ""
 
@@ -5023,7 +5116,7 @@ msgid "My Books"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:69
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:289
 msgid "Generate catalog"
 msgstr ""
 
@@ -5156,157 +5249,157 @@ msgstr ""
 msgid "Narrow"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:503
 msgid "System port selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:503
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:504
 msgid ""
 "The value <b>%d</b> you have chosen for the content server port is a system "
 "port. Your operating system <b>may</b> not allow the server to run on this "
 "port. To be safe choose a port number larger than 1024."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:524
 msgid "Failed to install command line tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:527
 msgid "Command line tools installed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:528
 msgid "Command line tools installed in"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:529
 msgid ""
 "If you move calibre.app, you have to re-install the command line tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:580
 msgid "No valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:581
 msgid "%s is not a valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:584
 msgid "Choose plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:596
 msgid "Plugin cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:597
 msgid "The plugin: %s cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:606
 msgid "Plugin not customizable"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:607
 msgid "Plugin: %s does not need customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:615
 msgid "Customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:652
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:653
 msgid "Cannot remove builtin plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:653
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:654
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:684
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:685
 msgid "You must select a column to delete it"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:690
 msgid "The selected column is not a custom column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:690
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:691
 #: /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/config/__init__.py:691
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:692
 msgid "Do you really want to delete column %s and all its data?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:758
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:759
 msgid "Error log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:765
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:766
 msgid "Access log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:793
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:794
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:331
 msgid "Failed to start content server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:817
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:818
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:587
 msgid "Select location for books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:824
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:825
 msgid "Invalid size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:825
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:826
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:884
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:889
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:891
 msgid "Invalid database location"
 msgstr "Ubicació de la base de dades no vàlida"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:885
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:887
 msgid "Invalid database location "
 msgstr "Ubicació de la base de dades no vàlida "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:888
 msgid "<br>Must be a directory."
 msgstr "<br>Cal que siga un directori."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:890
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:892
 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/__init__.py:895
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:897
 msgid "Must restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:896
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:898
 msgid ""
 "The changes you made require that Calibre be restarted. Please restart as "
 "soon as practical."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:930
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:932
 msgid "Checking database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:950
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:952
 msgid "Failed to check database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:957
 msgid "Some inconsistencies found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:956
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:958
 msgid ""
 "The following books had formats listed in the database that are not actually "
 "available. The entries for the formats have been removed. You should check "
@@ -5314,32 +5407,32 @@ msgid ""
 "folder directly."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:133
 msgid "TabWidget"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:134
 msgid ""
 "Here you can control how calibre will read metadata from the files you add "
 "to it. calibre can either read metadata from the contents of the file, or "
 "from the filename."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:135
 msgid "Read metadata only from &file name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:136
 msgid ""
 "Swap the firstname and lastname of the author. This affects only metadata "
 "read from file names."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:137
 msgid "&Swap author firstname and lastname"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:138
 msgid ""
 "If an existing book with a similar title and author is found that does not "
 "have the format being added, the format is added\n"
@@ -5350,380 +5443,395 @@ msgid ""
 "punctuation, case, etc. Author match is exact."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:142
 msgid ""
 "If books with similar titles and authors found, &merge the new files "
 "automatically"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:143
 msgid "&Configure metadata from file name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:144
 msgid "&Adding books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:145
 msgid ""
 "Here you can control how calibre will save your books when you click the "
 "Save to Disk button:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:146
 msgid "Save &cover separately"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:147
 msgid "Update &metadata in saved copies"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:148
 msgid "Save metadata in &OPF file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:149
 msgid "Convert non-English characters to &English equivalents"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:150
 msgid "Format &dates as:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:151
 msgid "File &formats to save:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:152
 msgid "Replace space with &underscores"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:153
 msgid "Change paths to &lowercase"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:154
 msgid "&Saving books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:135
-msgid "Preserve device collections."
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:155
+msgid "Metadata &management:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:156
+msgid "Manual management"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:157
+msgid "Only on send"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:158
+msgid "Automatic management"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:159
 msgid ""
-"If checked, collections will not be deleted even if a book with changed "
-"metadata is resent and the collection is not in the book's metadata. In "
-"addition, editing collections in the device view will be enabled. If "
-"unchecked, collections will be always reflect only the metadata in the "
-"calibre library."
+"<li><b>Manual Management</b>: Calibre updates the metadata and adds "
+"collections only when a book is sent. With this option, calibre will never "
+"remove a collection.</li>\n"
+"<li><b>Only on send</b>: Calibre updates metadata and adds/removes "
+"collections for a book only when it is sent to the device. </li>\n"
+"<li><b>Automatic management</b>: Calibre automatically keeps metadata on the "
+"device in sync with the calibre library, on every connect</li></ul>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:137
-msgid "  "
-msgstr "  "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:162
 msgid ""
 "Here you can control how calibre will save your books when you click the "
 "Send to Device button. This setting can be overriden for individual devices "
 "by customizing the device interface plugins in Preferences->Plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:163
 msgid "Sending to &device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:167
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:174
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr "Preferències"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
 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/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
 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/config_ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
 msgid "Show notification when &new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
 msgid "Download &social metadata (tags/ratings/etc.) by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
 msgid "&Overwrite author and title by default when fetching metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
 msgid "Default network &timeout:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
 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/config_ui.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
 msgid " seconds"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
 msgid "Normal"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
 msgid "High"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
 msgid "Low"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
 msgid "Job &priority:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
 msgid "Preferred &output format:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
 msgid "Preferred &input format order:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
 msgid "Use &Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
 msgid "Show &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
 msgid "Show &average ratings in the tags browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
 msgid "Search as you type"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
 msgid "&Delete news from library when it is automatically sent to reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
 msgid "Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
 msgid "Small"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
 msgid "&Button size in toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
 msgid "Show &text in toolbar buttons"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
 msgid "Select visible &columns in library view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
 msgid "Remove a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
 msgid "Add a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
 msgid "Edit settings of a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
 msgid "Use internal &viewer for:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
 msgid "User Interface &layout (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
 msgid "Disable &animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
-msgid "Add an email address to which to send books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
-msgid "&Add email"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
-msgid "Make &default"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
-msgid "&Remove email"
+msgid "Show &donate button (restart)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
+msgid "Add an email address to which to send books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
+msgid "&Add email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
+msgid "Make &default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
+msgid "&Remove email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
 msgid ""
 "calibre can send your books to you (or your reader) by email. Emails will be "
 "automatically sent for downloaded news to all email addresses that have Auto-"
 "send checked."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
 msgid "&Maximum number of waiting worker processes (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
 msgid "&Check database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
 msgid "&Install command line tools"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
 msgid "Open calibre &configuration directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
 msgid "Limit the max. simultaneous jobs to the available CPU &cores"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
 msgid "Debug &device detection"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
 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/config_ui.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
 msgid "Server &port:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:212
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:117
 msgid "&Username:"
 msgstr "Nom d'&usuari:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:213
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:119
 msgid "&Password:"
 msgstr "&Contrasenya:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
 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/config_ui.py:615
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
 msgid "Max. &cover size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:621
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:214
 msgid "&Show password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
 msgid "Max. &OPDS items per query:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
 msgid "Max. OPDS &ungrouped items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
 msgid "&Start Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:621
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
 msgid "St&op Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:626
 msgid "&Test Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
 msgid "Run server &automatically on startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:628
 msgid "View &server logs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:46
 msgid ""
 "<p>Remember to leave calibre running as the server only runs as long as "
@@ -5734,33 +5842,33 @@ msgid ""
 "the IP address of the computer calibre is running on."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:631
 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/config_ui.py:628
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:632
 msgid "Enable/&Disable plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:633
 msgid "&Customize plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:630
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:634
 msgid "&Remove plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:635
 msgid "Add new plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:632
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:636
 msgid "Plugin &file:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:634
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:638
 msgid "&Add"
 msgstr ""
 
@@ -5798,9 +5906,9 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:31
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:884
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:889
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Date"
 msgstr "Data"
@@ -5992,12 +6100,18 @@ msgstr ""
 msgid "ERROR"
 msgstr "ERROR"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:67
+msgid ""
+"All checked books will be <b>permanently deleted</b> from your device. "
+"Please verify the list."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 msgid "Location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1058
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1064
 msgid "Format"
 msgstr "Format"
 
@@ -6798,6 +6912,10 @@ msgstr ""
 msgid "Add tag to available tags and apply it to current book"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:20
+msgid "%s (was %s)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:501
 msgid "Item is blank"
@@ -7088,11 +7206,11 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:88
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:93
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:98
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:100
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:99
 msgid "No match"
 msgstr ""
 
@@ -7132,146 +7250,164 @@ msgstr ""
 msgid "Save single format to disk..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:53
 msgid "Edit metadata individually"
 msgstr "Edita metadades individualment"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:56
 msgid "Edit metadata in bulk"
 msgstr "Edita metadades en massa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:59
 msgid "Download metadata and covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:62
 msgid "Download only metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:64
 msgid "Download only covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:67
 msgid "Download only social metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:73
 msgid "Merge into first selected book - delete others"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:76
 msgid "Merge into first selected book - keep others"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:84
 msgid "Add books from a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:86
 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/init.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:90
 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/init.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:93
 msgid "Add Empty book. (Book entry with no formats)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:102
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:160
 msgid "Save to disk"
 msgstr "Desa al disc"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Save to disk in a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:106
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:402
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:393
 msgid "Save only %s format to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:110
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:396
 msgid "Save only %s format to disk in a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:119
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:166
 msgid "View"
 msgstr "Mostra"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:121
 msgid "View specific format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:127
 msgid "Remove selected books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:129
 msgid "Remove files of a specific format from selected books.."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:132
 msgid "Remove all formats from selected books, except..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:135
 msgid "Remove covers from selected books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:138
 msgid "Remove matching books from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:155
 msgid "Convert individually"
 msgstr "Converteix individualment"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:157
 msgid "Bulk convert"
 msgstr "Converteix tots"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:161
 msgid "Create catalog of books in your calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:169
 msgid "Run welcome wizard"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:191
 msgid "Similar books..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:223
 msgid "Add books to library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:234
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:241
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:239
 msgid "Manage collections"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:328
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:319
 msgid "Cover Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:337
 msgid "Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:358
+msgid "version"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:359
+msgid "created by Kovid Goyal"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:377
+msgid "Connected "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:386
+msgid "Update found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:430
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:439
 msgid "Book Details"
 msgstr ""
 
@@ -7334,6 +7470,218 @@ msgstr ""
 msgid " - Jobs"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:64
+msgid ""
+"Library\n"
+"%d books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:65
+msgid ""
+"Reader\n"
+"%s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:66
+msgid ""
+"Card A\n"
+"%s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:67
+msgid ""
+"Card B\n"
+"%s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:71
+msgid "Click to see the books available on your computer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:74
+msgid "Click to see the books in the main memory of your reader"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:75
+msgid "Click to see the books on storage card A in your reader"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:76
+msgid "Click to see the books on storage card B in your reader"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:84
+msgid "Books located at"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:100
+msgid "free"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:134
+msgid ""
+"Books display will be restricted to those matching the selected saved search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:136
+msgid "Advanced search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:141
+msgid ""
+"<p>Search the list of books by title, author, publisher, tags, comments, "
+"etc.<br><br>Words separated by spaces are ANDed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:142
+msgid "Reset Quick Search"
+msgstr "Reinicialitza la recerca ràpida"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:328
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:144
+msgid "Copy current search text (instead of search name)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:146
+msgid "Save current search under the name shown in the box"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:148
+msgid "Delete current saved search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:150
+msgid "Add books"
+msgstr "Afegeix llibres"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:151
+msgid "A"
+msgstr "A"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:153
+msgid "Remove books"
+msgstr "Suprimeix llibres"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:154
+msgid "Del"
+msgstr "Esborra"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:406
+msgid "Edit meta info"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:406
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:156
+msgid "E"
+msgstr "E"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:157
+msgid "Merge book records"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:158
+msgid "M"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:159
+msgid "Send to device"
+msgstr "Envia al dispositiu"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:161
+msgid "S"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:162
+msgid "Fetch news"
+msgstr "Recull notí­cies (RSS)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:163
+msgid "F"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:164
+msgid "Convert books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:165
+msgid "C"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:167
+msgid "V"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:168
+msgid "Open containing folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:169
+msgid "Show book details"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:170
+msgid "Books by same author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:171
+msgid "Books in this series"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:172
+msgid "Books by this publisher"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:173
+msgid "Books with the same tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:176
+msgid "Ctrl+P"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:177
+msgid "Help"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:178
+msgid "Browse the calibre User Manual"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:179
+msgid "F1"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:284
 msgid "N"
 msgstr ""
@@ -7355,29 +7703,29 @@ msgid "Rating"
 msgstr "Valoració"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:324
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1084
 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/models.py:674
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1176
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1182
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:886
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:885
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:890
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1156
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1162
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1165
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr ""
 
@@ -7421,11 +7769,11 @@ msgstr ""
 msgid "Restore default layout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:524
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:525
 msgid "Not allowed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:526
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
@@ -7622,155 +7970,34 @@ msgstr ""
 msgid "try deleting the file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:131
 msgid "calibre"
 msgstr "calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:133
 msgid "&Restrict to:"
 msgstr "&Restringit a:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
-msgid ""
-"Books display will be restricted to those matching the selected saved search"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:135
 msgid "set in ui.py"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
-msgid "Advanced search"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:138
 msgid "Alt+S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:139
 msgid "&Search:"
 msgstr "Re&cerca:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
-msgid ""
-"<p>Search the list of books by title, author, publisher, tags, comments, "
-"etc.<br><br>Words separated by spaces are ANDed"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
-msgid "Reset Quick Search"
-msgstr "Reinicialitza la recerca ràpida"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
-msgid "Choose saved search or enter name for new saved search"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
-msgid "Copy current search text (instead of search name)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
-msgid "Save current search under the name shown in the box"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
-msgid "Delete current saved search"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
-msgid "Add books"
-msgstr "Afegeix llibres"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
-msgid "A"
-msgstr "A"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
-msgid "Remove books"
-msgstr "Suprimeix llibres"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
-msgid "Del"
-msgstr "Esborra"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:155
 msgid "Edit meta information"
 msgstr "Edita la meta-informació"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
-msgid "E"
-msgstr "E"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
-msgid "Merge book records"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
-msgid "M"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
-msgid "Send to device"
-msgstr "Envia al dispositiu"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
-msgid "S"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
-msgid "Fetch news"
-msgstr "Recull notí­cies (RSS)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
-msgid "F"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
-msgid "Convert E-books"
-msgstr "Converteix Ebooks"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
-msgid "C"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
-msgid "V"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
-msgid "Open containing folder"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
-msgid "Show book details"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
-msgid "Books by same author"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
-msgid "Books in this series"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
-msgid "Books by this publisher"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
-msgid "Books with the same tags"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:175
 msgid "Configure calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
-msgid "Ctrl+P"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:20
 msgid ""
 "Redirect console output to a dialog window (both stdout and stderr). Useful "
@@ -7797,32 +8024,41 @@ msgstr ""
 msgid "No matches found for this book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:91
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:553
 msgid "Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:313
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:315
 msgid "The selected search will be <b>permanently deleted</b>. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:357
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr "Cerca (per avançada feu clic a Cerca al botó a l'esquerra)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:392
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:398
 msgid "Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:406
+msgid "Choose saved search or enter name for new saved search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:10
+msgid "Restrict to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:48
 msgid "({0} of {1})"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
 msgid "(all books)"
 msgstr "(tots els llibres)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:56
 msgid "({0} of all)"
 msgstr ""
 
@@ -7945,18 +8181,31 @@ msgstr "Ordena segons la popularitat"
 msgid "Sort by average rating"
 msgstr "Ordena segons la classificació"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:775
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:772
+msgid "Set the sort order for entries in the Tag Browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:778
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:775
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:778
 msgid "Match any"
 msgstr "Qualsevol coincidència"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:783
+msgid ""
+"When selecting multiple entries in the Tag Browser match any or all of them"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:787
 msgid "Manage &user categories"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:790
+msgid "Add your own categories to the Tag Browser"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182
 msgid "Convert book %d of %d (%s)"
@@ -7982,15 +8231,15 @@ msgstr ""
 msgid "Queueing "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:239
 msgid "Fetch news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:301
 msgid "Convert existing"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:302
 msgid ""
 "The following books have already been converted to %s format. Do you wish to "
 "reconvert them?"
@@ -8004,104 +8253,91 @@ msgstr ""
 msgid "&Donate to support calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:168
 msgid "&Eject connected device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:173
 msgid "&Restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:206
-msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:212
-msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:227
 msgid "Calibre Quick Start Guide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:389
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:380
 msgid "Cannot configure"
 msgstr "No puc configurar-lo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:376
 msgid "Cannot configure while there are running jobs."
 msgstr "No puc configurar-lo amb treballs processant-se"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:381
 msgid "Cannot configure before calibre is restarted."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:424
 msgid "No detailed info available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:425
 msgid "No detailed information is available for books on the device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:486
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:487
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:478
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using third party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:491
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:506
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:546
 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."
+"you find it useful, please consider donating to support its development. "
+"Your donation helps keep calibre development going."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:572
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:575
 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/ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:579
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:640
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:632
 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/update.py:52
-msgid ""
-"<span style=\"color:red; font-weight:bold\">Latest version: <a "
-"href=\"%s\">%s</a></span>"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/update.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:56
 msgid "Update available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/update.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:57
 msgid ""
 "%s has been updated to version %s. See the <a href=\"http://calibre-"
 "ebook.com/whats-new\">new features</a>. Visit the download page?"
@@ -8568,91 +8804,43 @@ msgstr ""
 msgid "Print eBook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
 msgid "Copy Image"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:240
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:239
 msgid "Paste Image"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:270
-msgid ""
-"Library\n"
-"%d\n"
-"books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:271
-msgid ""
-"Reader\n"
-"%s\n"
-"available"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:272
-msgid ""
-"Card A\n"
-"%s\n"
-"available"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:273
-msgid ""
-"Card B\n"
-"%s\n"
-"available"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:277
-msgid "Click to see the books available on your computer"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:280
-msgid "Click to see the books in the main memory of your reader"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:281
-msgid "Click to see the books on storage card A in your reader"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:282
-msgid "Click to see the books on storage card B in your reader"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:290
-msgid "Books located at"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:364
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:365
 msgid "Upper Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:366
 msgid "Lower Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:367
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:368
 msgid "Title Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:974
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:837
 msgid "Drag to resize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:869
 msgid "Show"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1012
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:876
 msgid "Hide"
 msgstr ""
 
@@ -9753,7 +9941,7 @@ msgid "User-created tag browser categories"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:702
-msgid "Preserve all collections even if not in library metadata."
+msgid "How and when calibre updates metadata on the device."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:43
@@ -9921,89 +10109,89 @@ msgstr ""
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:706
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:708
 msgid "Download finished"
 msgstr "S'ha finalitzat la baixada"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:708
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:710
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:714
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:716
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:716
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:718
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:718
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:720
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:807
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:809
 msgid "Could not fetch article. Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:828
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:830
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:833
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:835
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:839
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:841
 msgid "Trying to download cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:841
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:922
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:924
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:938
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:940
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:948
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:950
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:960
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
 msgid "Downloading cover from %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1002
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1190
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1192
 msgid "Untitled Article"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1261
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1263
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1272
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1274
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1289
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1291
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1436
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1438
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1452
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1454
 msgid ""
 "You do not have permission to download this issue. Either your subscription "
 "has expired or you have exceeded the maximum allowed downloads for today."
@@ -10433,6 +10621,9 @@ 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."
 
+#~ msgid "Convert E-books"
+#~ msgstr "Converteix Ebooks"
+
 #~ msgid "This profile is intended for the SONY PRS line. The 500/505/700 etc."
 #~ msgstr ""
 #~ "Aquest perfil és adient per a la línia del SONY PRS. Els models 500/505/700 "
@@ -10490,3 +10681,6 @@ msgstr ""
 #~ "EPUB s'utilitzarà a un dispositiu que no es compatible amb SVG, com l'iPhone "
 #~ "o el jetBook Lite. Sense aquesta opció, dits dispositius mostraran la tapa "
 #~ "com una pàgina en blanc."
+
+#~ msgid "  "
+#~ msgstr "  "
diff --git a/src/calibre/translations/calibre.pot b/src/calibre/translations/calibre.pot
index 16a7eae7ec..77dc4a9c2b 100644
--- a/src/calibre/translations/calibre.pot
+++ b/src/calibre/translations/calibre.pot
@@ -4,9 +4,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: calibre 0.7.8\n"
-"POT-Creation-Date: 2010-07-10 10:05+MDT\n"
-"PO-Revision-Date: 2010-07-10 10:05+MDT\n"
+"Project-Id-Version: calibre 0.7.9\n"
+"POT-Creation-Date: 2010-07-17 19:33+MDT\n"
+"PO-Revision-Date: 2010-07-17 19:33+MDT\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: LANGUAGE\n"
 "MIME-Version: 1.0\n"
@@ -25,23 +25,23 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:71
 #: /home/kovid/work/calibre/src/calibre/devices/prs500/books.py:267
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:492
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:499
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:398
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:97
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:100
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/metadata.py:56
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:428
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/input.py:67
-#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/input.py:69
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/input.py:70
+#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/input.py:72
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:335
 #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:338
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1894
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1896
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:24
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:235
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:276
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:279
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:390
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:278
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:281
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:395
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:20
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:21
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/ereader.py:36
@@ -60,14 +60,14 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pml.py:23
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pml.py:49
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:14
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:38
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:64
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:77
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:118
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:152
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:610
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:816
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:818
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:39
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:65
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:78
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:119
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:153
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:611
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:817
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:819
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:49
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:51
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:911
@@ -98,10 +98,10 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/split.py:82
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:97
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:98
-#: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:233
-#: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:291
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:298
+#: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:240
+#: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:294
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:814
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:817
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:172
@@ -110,10 +110,10 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:135
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:899
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:908
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1191
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1194
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:897
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:906
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1189
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1192
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:120
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:155
@@ -128,13 +128,13 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:185
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:213
 #: /home/kovid/work/calibre/src/calibre/library/database.py:913
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:335
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:347
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:950
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1019
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1620
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1622
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1744
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:339
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:351
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:954
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1023
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1624
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1626
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1748
 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:268
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:134
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:137
@@ -415,11 +415,11 @@ msgstr ""
 msgid "Communicate with Android phones."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:45
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:46
 msgid "Comma separated list of directories to send e-books to on the device. The first one that exists will be used"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:77
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:88
 msgid "Communicate with S60 phones."
 msgstr ""
 
@@ -440,14 +440,14 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:362
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:921
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:957
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2791
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2830
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2802
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2841
 msgid "%d of %d"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:962
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2836
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2847
 msgid "finished"
 msgstr ""
 
@@ -476,15 +476,15 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:807
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:813
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:841
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:239
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:167
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:180
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1504
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:243
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:171
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:184
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1508
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:132
 msgid "News"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2698
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2709
 msgid "Communicate with iTunes."
 msgstr ""
 
@@ -606,6 +606,10 @@ msgstr ""
 msgid "Communicate with the JetBook eBook reader."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:86
+msgid "Communicate with the MiBuk Wolder reader."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:42
 msgid "Communicate with the Kindle eBook reader."
 msgstr ""
@@ -1590,7 +1594,7 @@ msgstr ""
 msgid "Comic"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:389
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:394
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:98
@@ -1603,7 +1607,7 @@ msgstr ""
 msgid "Title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:390
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:395
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:364
@@ -1611,22 +1615,22 @@ msgstr ""
 msgid "Author(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:391
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:396
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
 msgid "Publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:392
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:397
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:393
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:398
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:35
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:210
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:211
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:184
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:67
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:318
@@ -1634,42 +1638,42 @@ msgstr ""
 msgid "Comments"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:406
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:27
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:306
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1075
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:139
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:143
 msgid "Tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:403
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:408
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:26
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:323
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1084
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:87
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:91
 msgid "Series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:404
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:409
 msgid "Language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:406
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:411
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1067
 msgid "Timestamp"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:408
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:413
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 msgid "Published"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:410
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:415
 msgid "Rights"
 msgstr ""
 
@@ -1898,7 +1902,7 @@ msgstr ""
 msgid "All articles"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:258
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:259
 msgid "This is an Amazon Topaz book. It cannot be processed."
 msgstr ""
 
@@ -2237,7 +2241,7 @@ msgstr ""
 msgid "Specify the character encoding of the output document. The default is cp1252."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:199
+#: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:200
 msgid ""
 "This RTF file has a feature calibre does not support. Convert it to HTML first and then try it.\n"
 "%s"
@@ -2288,127 +2292,119 @@ msgid "Confirm before deleting"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:37
-msgid "Toolbar icon size"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:39
-msgid "Show button labels in the toolbar"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:41
 msgid "Main window geometry"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:43
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:39
 msgid "Notify when a new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:41
 msgid "Use Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:43
 msgid "Sort tags list by name, popularity, or rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:45
 msgid "Number of covers to show in the cover browsing mode"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
 msgid "Defaults for conversion to LRF"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:49
 msgid "Options for the LRF ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:52
 msgid "Formats that are viewed using the internal viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:54
 msgid "Columns to be displayed in the book list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:55
 msgid "Automatically launch content server on application startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
 msgid "Oldest news kept in database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
 msgid "Show system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:59
 msgid "Upload downloaded news to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:61
 msgid "Delete books from library after uploading to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:63
 msgid "Show the cover flow in a separate window instead of in the main calibre window"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:65
 msgid "Disable notifications from the system tray icon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:67
 msgid "Default action to perform when send to device button is clicked"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:89
 msgid "Maximum number of waiting worker processes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:91
 msgid "Download social metadata (tags/rating/etc.)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
 msgid "Overwrite author and title with new metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Limit max simultaneous jobs to number of CPUs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "tag browser categories not to display"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
 msgid "The layout of the user interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
 msgid "Show the average rating per item indication in the tag browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:103
 msgid "Disable UI animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:151
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:476
 msgid "Copied"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:189
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:185
 msgid "Copy"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:189
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:185
 msgid "Copy to Clipboard"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:396
 msgid "Choose Files"
 msgstr ""
 
@@ -2646,8 +2642,8 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:659
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:638
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:523
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:951
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:923
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
 msgid "Error"
 msgstr ""
@@ -2756,7 +2752,7 @@ msgid "Cannot view"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1209
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:77
 msgid "Choose the format to view"
 msgstr ""
 
@@ -2797,7 +2793,7 @@ msgid "The specified directory could not be processed."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839
 msgid "No books"
 msgstr ""
 
@@ -2907,26 +2903,26 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:53
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:125
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:171
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:53
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:637
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:371
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:385
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:396
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:398
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:400
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:405
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library_ui.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:529
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:545
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:547
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:379
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:392
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:394
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:401
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:87
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:90
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:156
@@ -2942,12 +2938,6 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:143
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:145
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:147
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:186
@@ -2988,7 +2978,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:122
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:220
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:312
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:96
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:100
 msgid "Formats"
 msgstr ""
 
@@ -3020,10 +3010,11 @@ msgstr ""
 msgid "Click to open Book Details window"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml.py:16
-msgid "CSV/XML Options"
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex.py:16
+msgid "BibTeX Options"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex.py:17
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml.py:17
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input.py:16
@@ -3042,6 +3033,7 @@ msgstr ""
 msgid "Options specific to"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex.py:17
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml.py:17
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:18
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output.py:16
@@ -3055,6 +3047,7 @@ msgstr ""
 msgid "output"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex_ui.py:81
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml_ui.py:37
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_tab_template_ui.py:27
@@ -3065,7 +3058,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:28
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:119
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:115
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:166
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:66
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:115
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_input_ui.py:31
@@ -3073,11 +3066,11 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input_ui.py:38
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/rb_output_ui.py:28
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:62
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:46
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:45
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:50
 #: /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:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template_ui.py:41
@@ -3087,18 +3080,86 @@ msgstr ""
 msgid "Form"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex_ui.py:82
+msgid "Bib file encoding:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex_ui.py:83
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml_ui.py:38
 msgid "Fields to include in output:"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex_ui.py:84
+msgid "ascii/LaTeX"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex_ui.py:85
+msgid "Encoding configuration (change if you have errors) :"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex_ui.py:86
+msgid "strict"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex_ui.py:87
+msgid "replace"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex_ui.py:88
+msgid "ignore"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex_ui.py:89
+msgid "backslashreplace"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex_ui.py:90
+msgid "BibTeX entry type:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex_ui.py:91
+msgid "mixed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex_ui.py:92
+msgid "misc"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex_ui.py:93
+msgid "book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex_ui.py:94
+msgid "Create a citation tag?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex_ui.py:95
+msgid "Expression to form the BibTeX citation tag:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex_ui.py:96
+msgid ""
+"Some explanation about this template:\n"
+" -The fields availables are 'author_sort', 'authors', 'id',\n"
+"    'isbn', 'pubdate', 'publisher', 'series_index', 'series',\n"
+"   'tags', 'timestamp', 'title', 'uuid'\n"
+" -For list types ie authors and tags, only the first element\n"
+"   wil be selected.\n"
+" -For time field, only the date will be used. "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml.py:16
+msgid "CSV/XML Options"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:17
 msgid "E-book options"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:20
-#: /home/kovid/work/calibre/src/calibre/library/catalog.py:222
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1467
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1485
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:550
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1471
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1489
 msgid "Catalog"
 msgstr ""
 
@@ -3547,83 +3608,83 @@ msgstr ""
 msgid " is not a valid picture"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:168
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:402
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:396
 msgid "Book Cover"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:168
+msgid "Use cover from &source file"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:397
 msgid "Change &cover image:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:170
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:398
 msgid "Browse for an image to use as the cover of this book."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:172
-msgid "Use cover from &source file"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:173
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:357
 msgid "&Title: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:174
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:173
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:358
 msgid "Change the title of this book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:174
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:367
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:361
 msgid "&Author(s): "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:176
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:175
 msgid "Author So&rt:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:176
 msgid "Change the author(s) of this book. Multiple authors should be separated by a comma"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:178
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:177
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:167
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:370
 msgid "&Publisher: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:179
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:178
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:371
 msgid "Ta&gs: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:179
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:372
 msgid "Tags categorize the book. This is particularly useful while searching. <br><br>They can be any words or phrases, separated by commas."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:181
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:180
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:174
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:375
 msgid "&Series:"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:181
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:182
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:183
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:175
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:176
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:377
 msgid "List of known series. You can add new series."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:183
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:382
 msgid "Book "
 msgstr ""
 
@@ -3757,15 +3818,15 @@ msgstr ""
 msgid "RB Output"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:82
-msgid "Cannot build regex using the GUI builder without a book."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:82
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:83
 msgid "No formats available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:100
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:84
+msgid "Cannot build regex using the GUI builder without a book."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:103
 msgid "Open book"
 msgstr ""
 
@@ -3856,32 +3917,32 @@ msgid "The XPath expression %s is invalid."
 msgstr ""
 
 #:
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:61
 msgid "Chapter &mark:"
 msgstr ""
 
 #:
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:62
 msgid "Remove first &image"
 msgstr ""
 
 #:
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:63
 msgid "Insert &metadata as page at start of book"
 msgstr ""
 
 #:
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:64
 msgid "&Preprocess input file to possibly improve structure detection"
 msgstr ""
 
 #:
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:65
 msgid "Remove F&ooter"
 msgstr ""
 
 #:
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:66
 msgid "Remove H&eader"
 msgstr ""
 
@@ -3963,7 +4024,7 @@ msgstr ""
 msgid "Force maximum line lenght"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:50
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:51
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:65
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:66
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_ui.py:41
@@ -3974,7 +4035,7 @@ msgstr ""
 msgid "TextLabel"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:52
 msgid "Use a wizard to help construct the XPath expression"
 msgstr ""
 
@@ -4054,12 +4115,12 @@ msgstr ""
 msgid "Browse by covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:52
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:101
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:148
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:102
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:264
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:205
@@ -4068,44 +4129,48 @@ msgstr ""
 msgid "Undefined"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:53
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:131
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:133
 msgid "Yes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:53
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:132
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:134
 msgid "No"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:116
 msgid "star(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:117
 msgid "Unrated"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:249
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:150
+msgid "Set '%s' to today"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:260
 msgid " index:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:432
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:443
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:183
 msgid "Automatically number books in this series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:475
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:486
 msgid "Remove all tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:496
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:507
 msgid "tags to add"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:501
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:512
 msgid "tags to remove"
 msgstr ""
 
@@ -4214,145 +4279,145 @@ msgstr ""
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:660
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:659
 msgid "Select folder to open as device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:705
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:704
 msgid "Failed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:711
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:710
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:712
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:711
 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/device.py:754
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:753
 msgid "Device: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:756
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:755
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:840
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:847
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:845
 msgid "Choose format to send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:856
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:854
 msgid "No device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:857
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:855
 msgid "Cannot send: No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:860
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
 msgid "No card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:859
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:863
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:906
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:904
 msgid "E-book:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:909
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:907
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:910
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:908
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:181
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:911
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:909
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:924
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:922
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:954
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:962
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1054
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1235
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:952
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:960
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1052
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1114
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1233
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1241
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:953
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:963
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:961
 msgid "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:981
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:979
 msgid "Failed to email books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:982
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:980
 msgid "Failed to email the following books:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:986
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:984
 msgid "Sent by email:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1013
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1011
 msgid "News:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1014
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1012
 msgid "Attached is the"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1025
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1023
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1055
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1117
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1236
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1053
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1115
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1234
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1085
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1083
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1149
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1147
 msgid "Sending news to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1202
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1200
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1244
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1242
 msgid "Could not upload the following books to the device, as no suitable formats were found. Convert the book(s) to a format supported by your device first."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1305
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1304
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1306
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1305
 msgid "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
 
@@ -4421,6 +4486,66 @@ msgstr ""
 msgid "Choose Format"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library.py:38
+msgid "Choose location for calibre library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library.py:45
+msgid "Same as current"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library.py:46
+msgid "The location %s contains the current calibre library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library.py:51
+msgid "No existing library found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library.py:52
+msgid "There is no existing calibre library at %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library.py:56
+msgid "Not empty"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library.py:57
+msgid "The folder %s is not empty. Please choose an empty folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library.py:66
+msgid "Custom columns"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library.py:67
+msgid "If you use custom columns and they differ between libraries, you will have various problems. Best to ensure you have the same custom columns in each library."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library_ui.py:66
+msgid "Choose your calibre library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library_ui.py:67
+msgid "Your calibre library is currently located at {0}"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library_ui.py:68
+msgid "New &Location:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library_ui.py:69
+msgid "Use &existing library at the new location"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library_ui.py:70
+msgid "&Create an empty library at the new location"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library_ui.py:71
+msgid "&Move current library to new location"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:33
 msgid "Set defaults for conversion of comics (CBR/CBZ files)"
 msgstr ""
@@ -4515,159 +4640,137 @@ msgstr ""
 msgid "new email address"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:490
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:482
 msgid "Wide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:491
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:483
 msgid "Narrow"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:503
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:495
 msgid "System port selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:504
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:496
 msgid "The value <b>%d</b> you have chosen for the content server port is a system port. Your operating system <b>may</b> not allow the server to run on this port. To be safe choose a port number larger than 1024."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:524
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:516
 msgid "Failed to install command line tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:519
 msgid "Command line tools installed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:520
 msgid "Command line tools installed in"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:529
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:521
 msgid "If you move calibre.app, you have to re-install the command line tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:572
 msgid "No valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:573
 msgid "%s is not a valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:576
 msgid "Choose plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:588
 msgid "Plugin cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:589
 msgid "The plugin: %s cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:598
 msgid "Plugin not customizable"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:599
 msgid "Plugin: %s does not need customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:615
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:607
 msgid "Customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:653
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:645
 msgid "Cannot remove builtin plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:654
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:646
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:685
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:677
 msgid "You must select a column to delete it"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:690
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:682
 msgid "The selected column is not a custom column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:691
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:683
 #: /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/config/__init__.py:692
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:684
 msgid "Do you really want to delete column %s and all its data?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:759
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:751
 msgid "Error log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:766
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:758
 msgid "Access log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:794
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:786
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:312
 msgid "Failed to start content server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:818
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:587
-msgid "Select location for books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:825
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:811
 msgid "Invalid size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:826
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:812
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:891
-msgid "Invalid database location"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:887
-msgid "Invalid database location "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:888
-msgid "<br>Must be a directory."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:892
-msgid "Invalid database location.<br>Cannot write to "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:897
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:869
 msgid "Must restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:898
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:870
 msgid "The changes you made require that Calibre be restarted. Please restart as soon as practical."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:932
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:904
 msgid "Checking database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:952
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:924
 msgid "Failed to check database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:957
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:929
 msgid "Some inconsistencies found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:958
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:930
 msgid "The following books had formats listed in the database that are not actually available. The entries for the formats have been removed. You should check them manually. This can happen if you manipulate the files in the library folder directly."
 msgstr ""
 
@@ -4782,318 +4885,285 @@ msgstr ""
 msgid "Sending to &device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:168
-#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:425
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:386
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:523
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
-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/config_ui.py:556
-msgid "Browse for the new database location"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:515
 msgid "Show notification when &new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:516
 msgid "Download &social metadata (tags/ratings/etc.) by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:517
 msgid "&Overwrite author and title by default when fetching metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:518
 msgid "Default network &timeout:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:519
 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/config_ui.py:563
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:520
 msgid " seconds"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:521
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:522
 msgid "Normal"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:523
 msgid "High"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:524
 msgid "Low"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:525
 msgid "Job &priority:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:526
 msgid "Preferred &output format:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:527
 msgid "Preferred &input format order:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:530
 msgid "Use &Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:531
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:532
 msgid "Show &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:533
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:534
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:535
 msgid "Show &average ratings in the tags browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:536
 msgid "Search as you type"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:537
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:538
 msgid "&Delete news from library when it is automatically sent to reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:539
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
-msgid "Toolbar"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
-msgid "Large"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
-msgid "Medium"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
-msgid "Small"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
-msgid "&Button size in toolbar"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
-msgid "Show &text in toolbar buttons"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:540
 msgid "Select visible &columns in library view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:542
 msgid "Remove a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:544
 msgid "Add a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:546
 msgid "Edit settings of a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:549
 msgid "Use internal &viewer for:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:550
 msgid "User Interface &layout (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
 msgid "Disable &animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
 msgid "Show &donate button (restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
 msgid "Add an email address to which to send books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
 msgid "&Add email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
 msgid "Make &default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
 msgid "&Remove email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
 msgid "calibre can send your books to you (or your reader) by email. Emails will be automatically sent for downloaded news to all email addresses that have Auto-send checked."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
 msgid "&Maximum number of waiting worker processes (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
 msgid "&Check database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
 msgid "&Install command line tools"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
 msgid "Open calibre &configuration directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
 msgid "Limit the max. simultaneous jobs to the available CPU &cores"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
 msgid "Debug &device detection"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
 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/config_ui.py:615
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
 msgid "Server &port:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:212
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:117
 msgid "&Username:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:213
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:119
 msgid "&Password:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
 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/config_ui.py:619
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
 msgid "The maximum size (widthxheight) for displayed covers. Larger covers are resized. "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
 msgid "Max. &cover size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:621
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:214
 msgid "&Show password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
 msgid "Max. &OPDS items per query:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
 msgid "Max. OPDS &ungrouped items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
 msgid "&Start Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
 msgid "St&op Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:626
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
 msgid "&Test Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
 msgid "Run server &automatically on startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:628
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
 msgid "View &server logs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:46
 msgid ""
 "<p>Remember to leave calibre running as the server only runs as long as calibre is running.\n"
 "<p>Stanza should see your calibre collection automatically. If not, try adding the URL http://myhostname:8080 as a new catalog in the Stanza reader on your iPhone. Here myhostname should be the fully qualified hostname or the IP address of the computer calibre is running on."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
 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/config_ui.py:632
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
 msgid "Enable/&Disable plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:633
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
 msgid "&Customize plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:634
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
 msgid "&Remove plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:635
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
 msgid "Add new plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:636
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
 msgid "Plugin &file:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:638
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
 msgid "&Add"
 msgstr ""
 
@@ -5493,19 +5563,19 @@ msgid "Author s&ort: "
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:161
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:363
 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:162
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:366
 msgid "&Rating:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:163
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:164
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:373
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:367
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:368
 msgid "Rating of this book. 0-5 stars"
 msgstr ""
 
@@ -5514,7 +5584,7 @@ msgid "No change"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:166
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:369
 msgid " stars"
 msgstr ""
 
@@ -5524,8 +5594,8 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:171
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:379
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:380
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:374
 msgid "Open Tag Editor"
 msgstr ""
 
@@ -5565,12 +5635,12 @@ msgid "Remove &stored conversion settings for the selected books"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:188
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:403
 msgid "&Basic metadata"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:189
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:404
 msgid "&Custom metadata"
 msgstr ""
 
@@ -5692,79 +5762,79 @@ msgstr ""
 msgid "Could not open %s. Is it being used by another program?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:355
 msgid "Edit Meta Information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:362
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:356
 msgid "Meta information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:359
 msgid "Swap the author and title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:362
 msgid "Author S&ort: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:370
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:364
 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:384
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:378
 msgid "Remove unused series (Series that have no books)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:386
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:380
 msgid "IS&BN:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:381
 msgid "Publishe&d:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:384
 msgid "dd MMM yyyy"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:385
 msgid "&Date:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:392
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:386
 msgid "&Comments"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:387
 msgid "&Fetch metadata from server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:394
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:388
 msgid "Available Formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:389
 msgid "Add a new format for this book to the database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:397
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:391
 msgid "Remove the selected formats for this book from the database."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:393
 msgid "Set the cover for the book from the selected format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:401
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:395
 msgid "Update metadata from the metadata in the selected format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:406
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:400
 msgid "Reset cover to default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:402
 msgid "Download &cover"
 msgstr ""
 
@@ -5839,24 +5909,24 @@ msgstr ""
 msgid "Last downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:219
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:192
 msgid "Schedule news download"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:222
 msgid "Add a custom news source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:224
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:227
 msgid "Download all scheduled new sources"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:321
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:327
 msgid "No internet connection"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:322
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:328
 msgid "Cannot download news as no internet connection is active"
 msgstr ""
 
@@ -6041,12 +6111,12 @@ msgid "Choose formats"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:76
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:80
 msgid "Authors"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:107
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:111
 msgid "Publishers"
 msgstr ""
 
@@ -6462,164 +6532,46 @@ msgstr ""
 msgid "Regular expression (?P<isbn>)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:36
-msgid "Save single format to disk..."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:53
-msgid "Edit metadata individually"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:56
-msgid "Edit metadata in bulk"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:59
-msgid "Download metadata and covers"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:62
-msgid "Download only metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:64
-msgid "Download only covers"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:67
-msgid "Download only social metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:73
-msgid "Merge into first selected book - delete others"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:76
-msgid "Merge into first selected book - keep others"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:84
-msgid "Add books from a single directory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:86
-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/init.py:90
-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/init.py:93
-msgid "Add Empty book. (Book entry with no formats)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:103
-#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:409
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:160
-msgid "Save to disk"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
-msgid "Save to disk in a single directory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:107
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:393
-msgid "Save only %s format to disk"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:111
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:396
-msgid "Save only %s format to disk in a single directory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:120
-#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:412
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:166
-msgid "View"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:121
-msgid "View specific format"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:127
-msgid "Remove selected books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:129
-msgid "Remove files of a specific format from selected books.."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:132
-msgid "Remove all formats from selected books, except..."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:135
-msgid "Remove covers from selected books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:138
-msgid "Remove matching books from device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:155
-msgid "Convert individually"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:157
-msgid "Bulk convert"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:161
-msgid "Create catalog of books in your calibre library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:169
-msgid "Run welcome wizard"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:191
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:33
 msgid "Similar books..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:223
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:65
 msgid "Add books to library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:225
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:232
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:81
 msgid "Manage collections"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:319
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:161
 msgid "Cover Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:179
 msgid "Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:200
 msgid "version"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:359
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:201
 msgid "created by Kovid Goyal"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:219
 msgid "Connected "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:386
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:228
 msgid "Update found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:272
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:281
 msgid "Book Details"
 msgstr ""
 
@@ -6682,215 +6634,303 @@ msgstr ""
 msgid " - Jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:64
-msgid ""
-"Library\n"
-"%d books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:65
-msgid ""
-"Reader\n"
-"%s"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:66
-msgid ""
-"Card A\n"
-"%s"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:67
-msgid ""
-"Card B\n"
-"%s"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:71
-msgid "Click to see the books available on your computer"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:74
-msgid "Click to see the books in the main memory of your reader"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:75
-msgid "Click to see the books on storage card A in your reader"
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:33
+msgid "Save single format to disk..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/layout.py:76
-msgid "Click to see the books on storage card B in your reader"
+msgid "Eject this device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:84
-msgid "Books located at"
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:85
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:192
+msgid "Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:100
-msgid "free"
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:86
+msgid "Show books in calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:287
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:87
+msgid "Reader"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:88
+msgid "Show books in the main memory of the device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:89
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:551
+msgid "Card A"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:90
+msgid "Show books in storage card A"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:91
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:553
+msgid "Card B"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:92
+msgid "Show books in storage card B"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:131
+msgid "available"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:162
 msgid "Books display will be restricted to those matching the selected saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:300
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:175
 msgid "Advanced search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:309
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:140
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:184
 msgid "<p>Search the list of books by title, author, publisher, tags, comments, etc.<br><br>Words separated by spaces are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:316
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:191
 msgid "Reset Quick Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:328
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:203
 msgid "Copy current search text (instead of search name)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:334
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:209
 msgid "Save current search under the name shown in the box"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:340
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:215
 msgid "Delete current saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:404
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:150
-msgid "Add books"
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:290
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:379
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:108
+msgid "%d books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:404
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:375
 msgid "A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:405
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:152
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:153
-msgid "Remove books"
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:375
+msgid "Add books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:405
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:154
-msgid "Del"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:406
-msgid "Edit meta info"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:406
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:376
 msgid "E"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:407
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:157
-msgid "Merge book records"
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:376
+msgid "Edit metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:407
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:158
-msgid "M"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:408
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:159
-msgid "Send to device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:409
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:161
-msgid "S"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:410
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:162
-msgid "Fetch news"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:410
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:163
-msgid "F"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:411
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:164
-msgid "Convert books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:411
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:165
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:377
 msgid "C"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:412
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:377
+msgid "Convert books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:378
 msgid "V"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:413
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:168
-msgid "Open containing folder"
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:475
+msgid "View"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:415
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:169
-msgid "Show book details"
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:380
+msgid "Choose calibre library to work with"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:417
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:170
-msgid "Books by same author"
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:381
+msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:419
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:171
-msgid "Books in this series"
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:381
+msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:421
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:172
-msgid "Books by this publisher"
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:382
+msgid "S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:423
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:173
-msgid "Books with the same tags"
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:458
+msgid "Save to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:425
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:176
-msgid "Ctrl+P"
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:383
+msgid "Send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:426
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:177
-msgid "Help"
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:384
+msgid "Del"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:426
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:178
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:384
+msgid "Remove books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:385
 msgid "Browse the calibre User Manual"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:426
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:385
 msgid "F1"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:385
+msgid "Help"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:386
+msgid "Ctrl+P"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:388
+msgid "M"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:388
+msgid "Merge book records"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:389
+msgid "Open containing folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:391
+msgid "Show book details"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:393
+msgid "Books by same author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:395
+msgid "Books in this series"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:397
+msgid "Books by this publisher"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:399
+msgid "Books with the same tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:408
+msgid "Edit metadata individually"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:411
+msgid "Edit metadata in bulk"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:414
+msgid "Download metadata and covers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:417
+msgid "Download only metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:419
+msgid "Download only covers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:422
+msgid "Download only social metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:428
+msgid "Merge into first selected book - delete others"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:431
+msgid "Merge into first selected book - keep others"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:439
+msgid "Add books from a single directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:441
+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/layout.py:445
+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/layout.py:448
+msgid "Add Empty book. (Book entry with no formats)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:460
+msgid "Save to disk in a single directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:462
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:374
+msgid "Save only %s format to disk"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:466
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:377
+msgid "Save only %s format to disk in a single directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:476
+msgid "View specific format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:482
+msgid "Remove selected books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:484
+msgid "Remove files of a specific format from selected books.."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:487
+msgid "Remove all formats from selected books, except..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:490
+msgid "Remove covers from selected books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:493
+msgid "Remove matching books from device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:510
+msgid "Convert individually"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:512
+msgid "Bulk convert"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:516
+msgid "Create catalog of books in your calibre library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:524
+msgid "Run welcome wizard"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:284
 msgid "N"
 msgstr ""
@@ -7172,34 +7212,6 @@ msgstr ""
 msgid "try deleting the file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:131
-msgid "calibre"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:133
-msgid "&Restrict to:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:135
-msgid "set in ui.py"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:138
-msgid "Alt+S"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:139
-msgid "&Search:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:155
-msgid "Edit meta information"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:175
-msgid "Configure calibre"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:20
 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 ""
@@ -7226,7 +7238,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:554
 msgid "Search"
 msgstr ""
 
@@ -7250,15 +7262,16 @@ msgstr ""
 msgid "Restrict to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:48
-msgid "({0} of {1})"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:16
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:55
 msgid "(all books)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:49
+msgid "({0} of {1})"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:57
 msgid "({0} of all)"
 msgstr ""
 
@@ -7357,7 +7370,7 @@ msgid "Manage User Categories"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:271
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:275
 msgid "Searches"
 msgstr ""
 
@@ -7440,84 +7453,84 @@ msgstr ""
 msgid "The following books have already been converted to %s format. Do you wish to reconvert them?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:162
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:160
 msgid "&Restore"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:162
 msgid "&Donate to support calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:166
 msgid "&Eject connected device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:173
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:169
 msgid "&Restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:217
 msgid "Calibre Quick Start Guide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:375
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:380
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:361
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:357
 msgid "Cannot configure while there are running jobs."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:362
 msgid "Cannot configure before calibre is restarted."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:402
 msgid "No detailed info available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:403
 msgid "No detailed information is available for books on the device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:477
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:455
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:483
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:478
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:456
 msgid "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must first remove the DRM using third party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:491
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:469
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:506
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:484
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:546
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:524
 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. Your donation helps keep calibre development going."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:550
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:575
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:553
 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/ui.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:557
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:632
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:610
 msgid "will keep running in the system tray. To close it, choose <b>Quit</b> in the context menu of the system tray."
 msgstr ""
 
@@ -8013,15 +8026,15 @@ msgstr ""
 msgid "Title Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:837
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:838
 msgid "Drag to resize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:869
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:870
 msgid "Show"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:876
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:877
 msgid "Hide"
 msgstr ""
 
@@ -8058,6 +8071,10 @@ msgstr ""
 msgid "Could not move library"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:587
+msgid "Select location for books"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:662
 msgid "welcome wizard"
 msgstr ""
@@ -8289,7 +8306,7 @@ msgstr ""
 msgid "empty"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/catalog.py:41
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:48
 msgid ""
 "The fields to output when cataloging books in the database.  Should be a comma-separated list of fields.\n"
 "Available fields: %s.\n"
@@ -8297,7 +8314,7 @@ msgid ""
 "Applies to: CSV, XML output formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/catalog.py:51
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:58
 msgid ""
 "Output field to sort on.\n"
 "Available fields: author_sort, id, rating, size, timestamp, title.\n"
@@ -8305,28 +8322,85 @@ msgid ""
 "Applies to: CSV, XML output formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/catalog.py:202
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:206
+msgid ""
+"The fields to output when cataloging books in the database.  Should be a comma-separated list of fields.\n"
+"Available fields: %s.\n"
+"Default: '%%default'\n"
+"Applies to: BIBTEX output format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:216
+msgid ""
+"Output field to sort on.\n"
+"Available fields: author_sort, id, rating, size, timestamp, title.\n"
+"Default: '%default'\n"
+"Applies to: BIBTEX output format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:225
+msgid ""
+"Create a citation for BibTeX entries.\n"
+"Boolean value: True, False\n"
+"Default: '%default'\n"
+"Applies to: BIBTEX output format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:234
+msgid ""
+"The template for citation creation from database fields.\n"
+" Should be a template with {} enclosed fields.\n"
+"Available fields: %s.\n"
+"Default: '%%default'\n"
+"Applies to: BIBTEX output format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:244
+msgid ""
+"BibTeX file encoding output.\n"
+"Available types: utf8, cp1252, ascii.\n"
+"Default: '%default'\n"
+"Applies to: BIBTEX output format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:253
+msgid ""
+"BibTeX file encoding flag.\n"
+"Available types: strict, replace, ignore, backslashreplace.\n"
+"Default: '%default'\n"
+"Applies to: BIBTEX output format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:262
+msgid ""
+"Entry type for BibTeX catalog.\n"
+"Available types: book, misc, mixed.\n"
+"Default: '%default'\n"
+"Applies to: BIBTEX output format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:530
 msgid ""
 "Title of generated catalog used as title in metadata.\n"
 "Default: '%default'\n"
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/catalog.py:209
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:537
 msgid ""
 "Save the output from different stages of the conversion pipeline to the specified directory. Useful if you are unsure at which stage of the conversion process a bug is occurring.\n"
 "Default: '%default'None\n"
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/catalog.py:219
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:547
 msgid ""
 "Regex describing tags to exclude as genres.\n"
 "Default: '%default' excludes bracketed tags, e.g. '[<tag>]'\n"
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/catalog.py:225
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:553
 msgid ""
 "Comma-separated list of tag words indicating book should be excluded from output.  Case-insensitive.\n"
 "--exclude-tags=skip will match 'skip this book' and 'Skip will like this'.\n"
@@ -8334,28 +8408,28 @@ msgid ""
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/catalog.py:233
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:561
 msgid ""
 "Include 'Titles' section in catalog.\n"
 "Default: '%default'\n"
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/catalog.py:240
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:568
 msgid ""
 "Include 'Recently Added' section in catalog.\n"
 "Default: '%default'\n"
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/catalog.py:247
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:575
 msgid ""
 "Tag prefix for user notes, e.g. '*Jeff might enjoy reading this'.\n"
 "Default: '%default'\n"
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/catalog.py:254
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:582
 msgid ""
 "Sort titles with leading numbers as text, e.g.,\n"
 "'2001: A Space Odyssey' sorts as \n"
@@ -8364,14 +8438,14 @@ msgid ""
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/catalog.py:261
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:589
 msgid ""
 "Specifies the output profile.  In some cases, an output profile is required to optimize the catalog for the device.  For example, 'kindle' or 'kindle_dx' creates a structured Table of Contents with Sections and Articles.\n"
 "Default: '%default'\n"
 "Applies to: ePub, MOBI output formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/catalog.py:268
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:596
 msgid ""
 "Tag indicating book has been read.\n"
 "Default: '%default'\n"
@@ -8702,43 +8776,35 @@ msgstr ""
 msgid "%sAverage rating is %3.1f"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:545
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:549
 msgid "Main"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:547
-msgid "Card A"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:549
-msgid "Card B"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1770
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1774
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1799
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1803
 msgid "Copying <b>%s</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1816
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1820
 msgid "Compacting database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1909
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1913
 msgid "Checking SQL integrity..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1950
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1954
 msgid "Checking for missing files."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1972
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1976
 msgid "Checked id"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:118
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:122
 msgid "Ratings"
 msgstr ""
 
@@ -8893,10 +8959,6 @@ msgstr ""
 msgid "Write process PID to the specified file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:108
-msgid "%d books"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:127
 msgid "%d items"
 msgstr ""
@@ -8913,10 +8975,6 @@ msgstr ""
 msgid "SERIES: %s [%s]<br />"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:192
-msgid "Library"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:231
 msgid "Books in your library"
 msgstr ""
@@ -9258,12 +9316,12 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/model.py:73
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/model.py:82
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/model.py:183
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/model.py:193
 msgid "Scheduled"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/model.py:84
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/model.py:184
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/model.py:194
 msgid "Custom"
 msgstr ""
 
diff --git a/src/calibre/translations/cs.po b/src/calibre/translations/cs.po
index 5a1983fad7..3ac8cef1a7 100644
--- a/src/calibre/translations/cs.po
+++ b/src/calibre/translations/cs.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-07-03 01:21+0000\n"
-"PO-Revision-Date: 2010-07-02 18:25+0000\n"
+"POT-Creation-Date: 2010-07-09 22:00+0000\n"
+"PO-Revision-Date: 2010-07-09 20:31+0000\n"
 "Last-Translator: Kovid Goyal <Unknown>\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: 2010-07-03 03:43+0000\n"
+"X-Launchpad-Export-Date: 2010-07-10 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
@@ -27,10 +27,10 @@ msgstr "Nedělá vůbec nic"
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:71
 #: /home/kovid/work/calibre/src/calibre/devices/prs500/books.py:267
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:466
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:492
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:396
-#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:98
-#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:101
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:97
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:100
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/metadata.py:56
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:428
 #: /home/kovid/work/calibre/src/calibre/ebooks/fb2/input.py:67
@@ -72,9 +72,9 @@ msgstr "Nedělá vůbec nic"
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:818
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:49
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:51
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:910
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:915
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:981
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:911
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:916
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:982
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:137
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:139
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:108
@@ -102,20 +102,20 @@ msgstr "Nedělá vůbec nic"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:233
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:290
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:815
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:818
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:814
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:817
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:172
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:179
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:22
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:135
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:903
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:912
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1192
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1195
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:898
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:907
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1190
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1193
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:120
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:155
@@ -123,8 +123,8 @@ msgstr "Nedělá vůbec nic"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:172
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:362
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:877
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1054
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:882
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1060
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:87
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:92
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:185
@@ -170,7 +170,7 @@ msgstr "Zápis metadat"
 msgid "Catalog generator"
 msgstr "Generátor Katalogu"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:15
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:16
 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 "
@@ -180,7 +180,7 @@ msgstr ""
 "všechny soubory na které odkazy směrují. Tento modul je spušten pokaždé, "
 "když je do knihovny přidán HTML soubor."
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:51
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:52
 msgid ""
 "Character encoding for the input HTML files. Common choices include: cp1252, "
 "latin1, iso-8859-1 and utf-8."
@@ -188,7 +188,7 @@ msgstr ""
 "Kódování vstupních HTML souborů. Bežně používané kódování jsou např. cp1252, "
 "latin1 iso-8859-1 nebo UTF-8."
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:58
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:59
 msgid ""
 "Create a PMLZ archive containing the PML file and all images in the "
 "directory pmlname_img or images. This plugin is run every time you add a PML "
@@ -198,49 +198,49 @@ msgstr ""
 "pmlname_img nebo images. Tento plugin je spuštěn pokaždé když přidáte PML "
 "soubor do knihovny."
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:90
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:93
 msgid "Extract cover from comic files"
 msgstr "Vyjmout obálky ze souborů s komixy"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:117
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:128
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:140
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:150
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:160
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:171
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:181
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:191
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:201
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:211
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:221
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:232
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:243
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:255
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:276
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:287
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:297
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:307
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:120
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:131
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:153
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:163
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:174
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:184
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:194
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:204
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:214
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:224
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:235
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:246
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:258
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:279
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:290
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:300
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:310
 msgid "Read metadata from %s files"
 msgstr "Načíst metadata ze souborů %s"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:266
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:269
 msgid "Read metadata from ebooks in RAR archives"
 msgstr "Načíst metadata z elektronických knih v RAR archívech"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:318
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:321
 msgid "Read metadata from ebooks in ZIP archives"
 msgstr "Načíst metadata z elektronických knih v ZIP archívech"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:331
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:341
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:351
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:373
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:384
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:394
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:334
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:344
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:354
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:376
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:387
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:397
 msgid "Set metadata in %s files"
 msgstr "Nastavuje metadata do souborů %s"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:362
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:365
 msgid "Set metadata from %s files"
 msgstr "Nastavuje metadata ze souborů %s"
 
@@ -397,35 +397,35 @@ msgstr ""
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr "Tento profil je určený pro Amazon Kindle DX."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:31
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
 msgid "Installed plugins"
 msgstr "Nainstalované moduly"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:33
 msgid "Mapping for filetype plugins"
 msgstr "Přiřazení modulů k formátům souborů"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:33
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:34
 msgid "Local plugin customization"
 msgstr "Úprava Lokálních modulů"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:34
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
 msgid "Disabled plugins"
 msgstr "Deaktivované moduly"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
 msgid "Enabled plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:83
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:84
 msgid "No valid plugin found in "
 msgstr "Nebyl nalezen žádný platný modul v "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:460
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:468
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr "Inicializace modulu %s selhala s chybou:"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:493
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
 msgid ""
 "    %prog options\n"
 "\n"
@@ -437,30 +437,30 @@ msgstr ""
 "    Přizpůsobte calibre nahráním externích modulů.\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:499
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr "Přidejte modul zadáním cesty k ZIP archivu v kterém se nachází."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr "Odebrat modul podle jména. Vestavěné moduly není možné odebrat."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:503
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:511
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
 msgstr ""
 "Upravit modul. Zadejte název modulu a retězec s úpravami oddělené čárkou."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:505
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:513
 msgid "List all installed plugins"
 msgstr "Vypsat všechny nainstalované moduly"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Enable the named plugin"
 msgstr "Aktivovat modul podle jména"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Disable the named plugin"
 msgstr "Deaktivovat modul podle jména"
 
@@ -613,7 +613,7 @@ msgstr "Komunikuje se čtečkou Hanlin V5."
 msgid "Communicate with the BOOX eBook reader."
 msgstr "Komunikace se čtečkou BOOX eBook."
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:121
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:123
 msgid ""
 "Comma separated list of directories to send e-books to on the device. The "
 "first one that exists will be used."
@@ -684,7 +684,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:51
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:54
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:57
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:157
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:159
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:64
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:67
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:70
@@ -694,22 +694,22 @@ msgstr ""
 msgid "Getting list of books on device..."
 msgstr "Získávám seynam knih na zařízení..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:218
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:258
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:219
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:263
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:244
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:262
 msgid "Removing books from device..."
 msgstr "Odstraňuji knihy ze zařízení..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:262
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:269
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:267
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:274
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:269
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:274
 msgid "Removing books from device metadata listing..."
 msgstr "Odebírám knihy ze seznamu metadat v zařízení..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:274
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:308
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:313
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:208
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:238
 msgid "Adding books to device metadata listing..."
@@ -727,6 +727,10 @@ msgstr ""
 msgid "Communicate with the Sweex MM300"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/misc.py:75
+msgid "Communicate with the Pandigital Novel"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:17
 msgid "Communicate with the Nokia 770 internet tablet."
 msgstr "Komunikuje s tabletem Nokia 770."
@@ -1606,6 +1610,51 @@ msgstr "Probíhá převod elektronické knihy..."
 msgid "Creating"
 msgstr "Vytvářím"
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/__init__.py:18
+msgid "ePub Fixer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/epubcheck.py:18
+msgid "Workaround epubcheck bugs"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/epubcheck.py:22
+msgid ""
+"Workarounds for bugs in the latest release of epubcheck. epubcheck reports "
+"many things as errors that are not actually errors. %prog will try to detect "
+"these and replace them with constructs that epubcheck likes. This may cause "
+"significant changes to your epub, complain to the epubcheck project."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:19
+msgid ""
+"%prog [options] file.epub\n"
+"\n"
+"Fix common problems in EPUB files that can cause them to be rejected by "
+"poorly designed publishing services.\n"
+"\n"
+"By default, no fixing is done and messages are printed out for each error "
+"detected. Use the options to control which errors are automatically fixed."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:50
+msgid "You must specify an epub file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:17
+msgid "Fix unmanifested files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:21
+msgid ""
+"Fix unmanifested files. %prog can either add them to the manifest or delete "
+"them as specified by the delete unmanifested option."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:32
+msgid "Delete unmanifested files instead of adding them to the manifest"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:56
 msgid ""
 "Extract the contents of the generated EPUB file to the specified directory. "
@@ -1945,11 +1994,11 @@ msgstr "Komiks"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:98
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:882
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:887
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:543
 msgid "Title"
 msgstr "Název"
@@ -1958,7 +2007,7 @@ msgstr "Název"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:364
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:883
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:888
 msgid "Author(s)"
 msgstr "Autor(ři)"
 
@@ -1981,7 +2030,7 @@ msgstr "Producent"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:67
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:318
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1073
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1079
 msgid "Comments"
 msgstr "Komentáře"
 
@@ -1990,7 +2039,7 @@ msgstr "Komentáře"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:306
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1069
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1075
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:139
 msgid "Tags"
 msgstr "Tagy"
@@ -2000,7 +2049,7 @@ msgstr "Tagy"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:323
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1084
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:87
 msgid "Series"
 msgstr "Série"
@@ -2010,7 +2059,7 @@ msgid "Language"
 msgstr "Jazyk:"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:406
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1067
 msgid "Timestamp"
 msgstr "Časová značka"
 
@@ -2241,7 +2290,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1226
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1398
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1399
 msgid "Cover"
 msgstr "Obálka"
 
@@ -2280,70 +2329,70 @@ msgstr "Všechny články"
 msgid "This is an Amazon Topaz book. It cannot be processed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1399
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1400
 msgid "Title Page"
 msgstr "Titulní stránka"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1400
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1401
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:15
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:53
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:194
 msgid "Table of Contents"
 msgstr "Obsah"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1401
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1402
 msgid "Index"
 msgstr "Rejstřík"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1402
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1403
 msgid "Glossary"
 msgstr "Slovník pojmů"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1403
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1404
 msgid "Acknowledgements"
 msgstr "Pděkování"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1404
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1405
 msgid "Bibliography"
 msgstr "Bibliografie"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1405
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1406
 msgid "Colophon"
 msgstr "Tiráž"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1406
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1407
 msgid "Copyright"
 msgstr "Autorská práva"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1407
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1408
 msgid "Dedication"
 msgstr "Věnování"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1408
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1409
 msgid "Epigraph"
 msgstr "Doslov"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1409
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1410
 msgid "Foreword"
 msgstr "Předmluva"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1410
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1411
 msgid "List of Illustrations"
 msgstr "Seznam Ilustrací"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1411
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1412
 msgid "List of Tables"
 msgstr "Seznam tabulek"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1412
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1413
 msgid "Notes"
 msgstr "Poznámky"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1413
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1414
 msgid "Preface"
 msgstr "Úvod"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1414
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1415
 msgid "Main Text"
 msgstr "Hlavní text"
 
@@ -2388,7 +2437,7 @@ msgstr "Postraní panel"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:22
 #: /home/kovid/work/calibre/src/calibre/ebooks/tcr/input.py:23
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:23
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:24
 msgid ""
 "Normally calibre treats blank lines as paragraph markers. With this option "
 "it will assume that every line represents a paragraph instead."
@@ -2396,7 +2445,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:26
 #: /home/kovid/work/calibre/src/calibre/ebooks/tcr/input.py:27
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:27
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:28
 msgid ""
 "Normally calibre treats blank lines as paragraph markers. With this option "
 "it will assume that every line starting with an indent (either a tab or 2+ "
@@ -2527,7 +2576,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
 msgid "Author"
 msgstr ""
@@ -2664,19 +2713,19 @@ msgid ""
 "slowest."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:33
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:34
 msgid ""
 "Normally extra spaces are condensed into a single space. With this option "
 "all spaces will be displayed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:36
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:37
 msgid ""
 "Run the text input through the markdown pre-processor. To learn more about "
 "markdown see"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:39
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:40
 msgid "Do not insert a Table of Contents into the output text."
 msgstr ""
 
@@ -2839,7 +2888,7 @@ msgstr ""
 msgid "Copy to Clipboard"
 msgstr "&Kopírovat do schránky"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:400
 msgid "Choose Files"
 msgstr ""
 
@@ -2854,13 +2903,13 @@ msgid "User annotations generated from main library only"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:75
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:612
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:671
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:708
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:729
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:877
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1060
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:670
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:707
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:728
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:876
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:941
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1059
 msgid "No books selected"
 msgstr "Nejsou označeny žádné knihy"
 
@@ -2900,143 +2949,143 @@ msgstr ""
 msgid "How many empty books should be added?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:340
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:390
 msgid "Uploading books to device."
 msgstr "Odesílám knihy do zařízení"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:350
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:137
 msgid "Books"
 msgstr "Knihy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
 msgid "EPUB Books"
 msgstr "EPUB knihy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
 msgid "LRF Books"
 msgstr "LRF knihy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
 msgid "HTML Books"
 msgstr "HTML knihy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
 msgid "LIT Books"
 msgstr "LIT knihy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
 msgid "MOBI Books"
 msgstr "MOBI knihy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
 msgid "Topaz books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
 msgid "Text books"
 msgstr "TXT knihy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:359
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
 msgid "PDF Books"
 msgstr "PDF knihy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:359
 msgid "Comics"
 msgstr "Komiksy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:360
 msgid "Archives"
 msgstr "Archívy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:364
 msgid "Supported books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:399
 msgid "Merged some books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:401
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:400
 msgid ""
 "Some duplicates were found and merged into the following existing books:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:409
 msgid "Failed to read metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:410
 msgid "Failed to read metadata from the following"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:434
 msgid "Add to library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:460
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1229
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:459
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1228
 msgid "No book selected"
 msgstr "Není označena žádná kniha"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:434
 msgid "No book files found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:456
 msgid "Cannot delete"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:469
 msgid "Choose formats to be deleted"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:488
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:487
 msgid "Choose formats <b>not</b> to be deleted"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:507
 msgid "Cannot delete books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:509
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:508
 msgid "No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:519
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:518
 msgid "Main memory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:519
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:444
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:453
 msgid "Storage Card A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:521
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:520
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:446
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:455
 msgid "Storage Card B"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:525
 msgid "No books to delete"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:526
 msgid "None of the selected books are on the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:544
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:600
 msgid "Deleting books from device."
 msgstr "Mažu knihy ze zařízení."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:564
 msgid ""
 "The selected books will be <b>permanently deleted</b> and the files removed "
 "from your computer. Are you sure?"
@@ -3044,67 +3093,67 @@ msgstr ""
 "Označené knihy budou <b> trvale smazány </b> a soubory budou odstraněny z "
 "vašeho počítače. Opravdu je chcete odstranit?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:585
 msgid ""
 "The selected books will be <b>permanently deleted</b> from your device. Are "
 "you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:610
 msgid "Cannot download metadata"
 msgstr "Nemůžu stáhnout metadata."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:627
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
 msgid "social metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
 msgid "covers"
 msgstr "obálky"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
 msgid "metadata"
 msgstr "metadata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:630
 msgid "Downloading %s for %d book(s)"
 msgstr "Stahuji %s pro %d knihu(y)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:654
 msgid "Failed to download some metadata"
 msgstr "Selhalo stahování některých metadat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:656
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
 msgid "Failed to download metadata for the following:"
 msgstr "Selhalo stahovaní metadat pro následující:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:659
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:658
 msgid "Failed to download metadata:"
 msgstr "Selhalo stahování metadat:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:660
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:659
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:637
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:522
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:949
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:951
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
 msgid "Error"
 msgstr "Chyba"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:670
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:707
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:669
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:706
 msgid "Cannot edit metadata"
 msgstr "Nemůžu upravit metadata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:728
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:731
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:727
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:730
 msgid "Cannot merge books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:732
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:731
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:736
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:735
 msgid ""
 "All book formats and metadata from the selected books will be added to the "
 "<b>first selected book.</b><br><br> The second and subsequently selected "
@@ -3112,7 +3161,7 @@ msgid ""
 "proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:747
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:746
 msgid ""
 "All book formats and metadata from the selected books will be merged into "
 "the <b>first selected book</b>.<br><br>After merger the second and "
@@ -3122,99 +3171,99 @@ msgid ""
 "from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:759
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:758
 msgid ""
 "You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
 "proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:876
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:875
 msgid "Cannot save to disk"
 msgstr "Chyba zápisu na disk"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:878
 msgid "Choose destination directory"
 msgstr "Zvolte cílový adresář"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:912
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:911
 msgid "Error while saving"
 msgstr "Chyba při ukládání"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:913
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:912
 msgid "There was an error while saving."
 msgstr "Při ukládání nastala chyba."
 
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:919
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:920
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:921
 msgid "Could not save some books"
 msgstr "Nemohu uložit některé knihy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:922
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:921
 msgid "Click the show details button to see which ones."
 msgstr "Klikněte na tlačítko zobrazit detaily pro zjištění které z nich."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
 msgid "No books selected to generate catalog for"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:960
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:959
 msgid "Generating %s catalog..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:965
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:964
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:264
 msgid "No books found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:966
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:965
 msgid ""
 "No books to catalog\n"
 "Check exclude tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:976
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:975
 msgid "Catalog generated."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:979
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:978
 msgid "Export Catalog Directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:980
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:979
 msgid "Select destination for %s.%s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:996
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:995
 msgid "Fetching news from "
 msgstr "Získávám zprávy z "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1009
 msgid " fetched."
 msgstr " získány."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1059
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1058
 msgid "Cannot convert"
 msgstr "Nemůžu převást"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1088
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1087
 msgid "Starting conversion of %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1265
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1264
 msgid "Cannot view"
 msgstr "Nemůžu zobrazit"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1209
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
 msgid "Choose the format to view"
 msgstr "Vyberte formát který se má zobrazit"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1218
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1217
 msgid "Multiple Books Selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1219
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1218
 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 "
@@ -3222,11 +3271,11 @@ msgid ""
 "continue?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1227
 msgid "Cannot open folder"
 msgstr "Nemohu otevřít adresář"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1266
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1265
 msgid "%s has no available formats."
 msgstr "%s není dostupná v žádném dostupném formátu."
 
@@ -3251,7 +3300,7 @@ msgid "The specified directory could not be processed."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:845
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:840
 msgid "No books"
 msgstr "Žádné knihy"
 
@@ -3376,15 +3425,15 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:52
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:633
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:637
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:366
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:371
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:385
@@ -3408,12 +3457,12 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:265
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:186
@@ -3443,8 +3492,9 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:313
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1059
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1065
 msgid "Path"
 msgstr "Cesta"
 
@@ -3461,8 +3511,8 @@ msgid "Formats"
 msgstr "Formáty"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:25
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:886
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1062
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:891
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1068
 msgid "Collections"
 msgstr ""
 
@@ -3475,12 +3525,12 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:305
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:311
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:317
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1068
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1072
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1074
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:458
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:467
 msgid "None"
 msgstr "Žádné"
 
@@ -4544,11 +4594,11 @@ msgid ""
 "href=\"http://calibre-ebook.com/user_manual/xpath.html\">XPath Tutorial</a>."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:127
 msgid "Cover browser could not be loaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:179
 msgid "Browse by covers"
 msgstr "Prohlížet obálky"
 
@@ -4740,128 +4790,124 @@ msgstr "Zařízení: "
 msgid " detected."
 msgstr " nalezeno."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:778
-msgid "Connected "
-msgstr "Připojeno "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:846
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "selected to send"
 msgstr "vybrané k odeslání"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:851
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:846
 msgid "Choose format to send to device"
 msgstr "Vyberte formát k odeslání do zařízení"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:860
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:855
 msgid "No device"
 msgstr "Žádné zařízení"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:856
 msgid "Cannot send: No device is connected"
 msgstr "Nemohu odeslat: Není připojeno žádné zařízení"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:868
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:859
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:863
 msgid "No card"
 msgstr "Žádná karta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:869
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:860
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "Cannot send: Device has no storage card"
 msgstr "Nemohu odeslat: Zařízení nemá pamětovou kartu."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:910
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:905
 msgid "E-book:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:913
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:908
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:909
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:181
 msgid "by"
 msgstr "od"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:915
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:910
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:928
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:923
 msgid "Sending email to"
 msgstr "Odeslat email"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:958
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:965
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1057
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1118
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1236
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:953
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:961
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1053
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1115
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1234
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1242
 msgid "No suitable formats"
 msgstr "Žádné vhodné formáty"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:959
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:954
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:966
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:962
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:984
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:980
 msgid "Failed to email books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:985
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:981
 msgid "Failed to email the following books:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:989
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:985
 msgid "Sent by email:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1016
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1012
 msgid "News:"
 msgstr "Zprávy:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1017
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1013
 msgid "Attached is the"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1028
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1024
 msgid "Sent news to"
 msgstr "Odeslat zprávy do"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1058
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1237
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1054
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1235
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1087
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1084
 msgid "Sending catalogs to device."
 msgstr "Odeslat katalog do zařízení"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1150
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1148
 msgid "Sending news to device."
 msgstr "Odesílám zprávy do zařízení"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1201
 msgid "Sending books to device."
 msgstr "Odesílám knihy do zařízení"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1244
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1243
 msgid ""
 "Could not upload the following books to the device, as no suitable formats "
 "were found. Convert the book(s) to a format supported by your device first."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1305
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1304
 msgid "No space on device"
 msgstr "Na zařízení není volné místo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1306
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1305
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -4901,7 +4947,7 @@ msgid "My Books"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:69
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:289
 msgid "Generate catalog"
 msgstr "Generovat katalog"
 
@@ -5036,159 +5082,159 @@ msgstr ""
 msgid "Narrow"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:503
 msgid "System port selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:503
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:504
 msgid ""
 "The value <b>%d</b> you have chosen for the content server port is a system "
 "port. Your operating system <b>may</b> not allow the server to run on this "
 "port. To be safe choose a port number larger than 1024."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:524
 msgid "Failed to install command line tools."
 msgstr "Selhala Instalce nástrojů pro příkazovou řádku."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:527
 msgid "Command line tools installed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:528
 msgid "Command line tools installed in"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:529
 msgid ""
 "If you move calibre.app, you have to re-install the command line tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:580
 msgid "No valid plugin path"
 msgstr "Chybí platná cesta k modulům"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:581
 msgid "%s is not a valid plugin path"
 msgstr "%s není platná cesta k modulům"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:584
 msgid "Choose plugin"
 msgstr "Zvolte modul"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:596
 msgid "Plugin cannot be disabled"
 msgstr "Modul není možné deaktivovat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:597
 msgid "The plugin: %s cannot be disabled"
 msgstr "Modul %s nemůže být deaktivován"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:606
 msgid "Plugin not customizable"
 msgstr "Modul není upravitelný"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:607
 msgid "Plugin: %s does not need customization"
 msgstr "Modul %s nevyžaduje žádné úpravy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:615
 msgid "Customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:652
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:653
 msgid "Cannot remove builtin plugin"
 msgstr "Vestavěný modul není možné odstranit"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:653
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:654
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 " nemůže být odstraněn. Je to vestavěbý modul. Skuste ho místo odstranění "
 "deaktivovat."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:684
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:685
 msgid "You must select a column to delete it"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:690
 msgid "The selected column is not a custom column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:690
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:691
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
 msgid "Are you sure?"
 msgstr "Jste si jisti?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:691
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:692
 msgid "Do you really want to delete column %s and all its data?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:758
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:759
 msgid "Error log:"
 msgstr "Záznam o chybách:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:765
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:766
 msgid "Access log:"
 msgstr "Záznam o přístupu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:793
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:794
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:332
 msgid "Failed to start content server"
 msgstr "Nepodařilo se spustit obdahový server"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:817
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:818
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:587
 msgid "Select location for books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:824
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:825
 msgid "Invalid size"
 msgstr "Neplatná velikost"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:825
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:826
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr "Velikost %s je neplatná. Požadovaný formát je šířka x výška"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:884
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:889
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:891
 msgid "Invalid database location"
 msgstr "Neplatné umístění databáze"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:885
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:887
 msgid "Invalid database location "
 msgstr "Neplatné umístění databáze "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:888
 msgid "<br>Must be a directory."
 msgstr "<br>Musí být adresář."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:890
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:892
 msgid "Invalid database location.<br>Cannot write to "
 msgstr "Neplatné umístění databáze. <br> Nemůžu zapsat do "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:895
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:897
 msgid "Must restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:896
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:898
 msgid ""
 "The changes you made require that Calibre be restarted. Please restart as "
 "soon as practical."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:930
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:932
 msgid "Checking database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:950
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:952
 msgid "Failed to check database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:957
 msgid "Some inconsistencies found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:956
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:958
 msgid ""
 "The following books had formats listed in the database that are not actually "
 "available. The entries for the formats have been removed. You should check "
@@ -5316,14 +5362,14 @@ msgstr ""
 msgid "Sending to &device"
 msgstr "Odeslání do &zařízení"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:167
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr "Možnosti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
@@ -5331,27 +5377,27 @@ msgstr ""
 "&Umístění elektronických knih (Knihy jsou umístěné v adresářích podla autora "
 "a metadata jsou uložené v souboru metadata.db)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
 msgid "Browse for the new database location"
 msgstr "Určete nové umístění databáze"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
 msgid "Show notification when &new version is available"
 msgstr "Zobrazit upozornění pokud je dostupná &nová verze."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
 msgid "Download &social metadata (tags/ratings/etc.) by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
 msgid "&Overwrite author and title by default when fetching metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
 msgid "Default network &timeout:"
 msgstr "Výchozí časový &limit sítě:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
@@ -5359,182 +5405,186 @@ msgstr ""
 "Výchozí časový limit pro síťové dotazy (např. pokaždé když jdeme na Internet "
 "získat informace)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
 msgid " seconds"
 msgstr " sekund"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
 msgid "Choose &language (requires restart):"
 msgstr "Vyberte &jazyk (vyžaduje restart):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
 msgid "Normal"
 msgstr "Normální"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
 msgid "High"
 msgstr "Vysoká"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
 msgid "Low"
 msgstr "Nízká"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
 msgid "Job &priority:"
 msgstr "&Priorita úloh:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
 msgid "Preferred &output format:"
 msgstr "Upřednostňovaný výstupní formát:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
 msgid "Preferred &input format order:"
 msgstr "Pořadí preference &vstupních formátů:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
 msgid "Use &Roman numerals for series number"
 msgstr "Číslovat knihy v sérii &Římskými číslicemi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
 msgid "Enable system &tray icon (needs restart)"
 msgstr "Zobrazit &ikonu v sýstémové liště (vyžaduje restart)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
 msgid "Show &notifications in system tray"
 msgstr "Zobrazovat upozor&nění v systémové liště"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr "Zobrazit prohlížec &obálek v samostatném okně (vyžaduje restart)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
 msgid "Show &average ratings in the tags browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
 msgid "Search as you type"
 msgstr "Vyhledávat při zadávání"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr "&Automaticky odeslat stažené zprávy do čtecího zařízení"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
 msgid "&Delete news from library when it is automatically sent to reader"
 msgstr "Smazat zprávy z knihovny když jsou automaticky odeslány do čtečky"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr "Počet obálek zobraze&ných v přohlížecím módu (vyžaduje restart)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
 msgid "Toolbar"
 msgstr "Panel nástrojů"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
 msgid "Large"
 msgstr "Velké"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
 msgid "Medium"
 msgstr "Střední"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
 msgid "Small"
 msgstr "Malé"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
 msgid "&Button size in toolbar"
 msgstr "&Velikost tlačítek na panelu nástrojů"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
 msgid "Show &text in toolbar buttons"
 msgstr "Zobrazit &text na tlačítkách panelu nástrojů"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
 msgid "Select visible &columns in library view"
 msgstr "Viditelné sloup&ce v seznamu knih v knihovne"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
 msgid "Remove a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
 msgid "Add a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
 msgid "Edit settings of a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
 msgid "Use internal &viewer for:"
 msgstr "Použít interní &prohlížec pro:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
 msgid "User Interface &layout (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
 msgid "Disable &animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
+msgid "Show &donate button (restart)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
 msgid "Add an email address to which to send books"
 msgstr "Přdat emailovou adresu na kterou posílat knihy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
 msgid "&Add email"
 msgstr "Přidat em&ail"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
 msgid "Make &default"
 msgstr "Nastavit &výchozí"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
 msgid "&Remove email"
 msgstr "Odst&ranit email"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
 msgid ""
 "calibre can send your books to you (or your reader) by email. Emails will be "
 "automatically sent for downloaded news to all email addresses that have Auto-"
 "send checked."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
 msgid "&Maximum number of waiting worker processes (needs restart):"
 msgstr "&Maximální počet procesů ve frontě (vyžaduje restart):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
 msgid "&Check database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
 msgid "&Install command line tools"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
 msgid "Open calibre &configuration directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
 msgid "Limit the max. simultaneous jobs to the available CPU &cores"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
 msgid "Debug &device detection"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
 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 "
@@ -5544,25 +5594,25 @@ msgstr ""
 "pomocí internetového prohlížeče z jakehokoliv místa na světě. Změny v "
 "nastaení se projeví až po restartu serveru."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
 msgid "Server &port:"
 msgstr "&Port serveru:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:212
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:117
 msgid "&Username:"
 msgstr "&Uživatelské jméno:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:213
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:119
 msgid "&Password:"
 msgstr "&Heslo:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
@@ -5570,7 +5620,7 @@ msgstr ""
 "Pokud ponecháte heslo prázdné, kdokoliv bude mít přístup k vaší zbírce knih "
 "přes webové rozhraní."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
@@ -5578,45 +5628,45 @@ msgstr ""
 "Maximální velikost (šířka x výška) zobrazených obálek. Velké obálky budou "
 "zmenšené. "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
 msgid "Max. &cover size:"
 msgstr "Max. velikost &obálek:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:621
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:214
 msgid "&Show password"
 msgstr "Zobrazit he&slo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
 msgid "Max. &OPDS items per query:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
 msgid "Max. OPDS &ungrouped items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
 msgid "&Start Server"
 msgstr "&Spustit server"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:621
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
 msgid "St&op Server"
 msgstr "&Zastavit server"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:626
 msgid "&Test Server"
 msgstr "&Test serveru"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
 msgid "Run server &automatically on startup"
 msgstr "&Automaticky spustit server při startu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:628
 msgid "View &server logs"
 msgstr "Zobrazit &serverové záznamy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:46
 msgid ""
 "<p>Remember to leave calibre running as the server only runs as long as "
@@ -5627,34 +5677,34 @@ msgid ""
 "the IP address of the computer calibre is running on."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:631
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
 msgstr ""
 "Tady můžete upravit chování calibre, určením které moduly bude používat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:628
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:632
 msgid "Enable/&Disable plugin"
 msgstr "Aktivovat/&Deaktivovat modul"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:633
 msgid "&Customize plugin"
 msgstr "&Upravit modul"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:630
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:634
 msgid "&Remove plugin"
 msgstr "&Odstranit modul"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:635
 msgid "Add new plugin"
 msgstr "Přidat nový modul"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:632
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:636
 msgid "Plugin &file:"
 msgstr "&Soubor modulu:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:634
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:638
 msgid "&Add"
 msgstr "Přid&at"
 
@@ -5692,9 +5742,9 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:31
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:884
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:889
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Date"
 msgstr "Datum"
@@ -5886,12 +5936,18 @@ msgstr "&Znovu zobrazit toto upozornění"
 msgid "ERROR"
 msgstr "CHYBA"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:67
+msgid ""
+"All checked books will be <b>permanently deleted</b> from your device. "
+"Please verify the list."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 msgid "Location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1058
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1064
 msgid "Format"
 msgstr "Formát"
 
@@ -6691,6 +6747,10 @@ msgstr ""
 msgid "Add tag to available tags and apply it to current book"
 msgstr "Přidat tag do seznamu dostupných tagů a aplikovat na aktuální knihu"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:20
+msgid "%s (was %s)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:501
 msgid "Item is blank"
@@ -7037,43 +7097,43 @@ msgstr "Regulární výraz (?P<isbn>)"
 msgid "Save single format to disk..."
 msgstr "Uložit jediný formát na disk..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:53
 msgid "Edit metadata individually"
 msgstr "Upravit metadata Individuálně"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:56
 msgid "Edit metadata in bulk"
 msgstr "Upravit metadata dávkově"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:59
 msgid "Download metadata and covers"
 msgstr "Stáhnout metadata a obálky"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:62
 msgid "Download only metadata"
 msgstr "Stáhnout pouze metadata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:64
 msgid "Download only covers"
 msgstr "Stáhnout pouze obálky"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:67
 msgid "Download only social metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:73
 msgid "Merge into first selected book - delete others"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:76
 msgid "Merge into first selected book - keep others"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:84
 msgid "Add books from a single directory"
 msgstr "Přidat Knihy z jednoho adresáře"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:86
 msgid ""
 "Add books from directories, including sub-directories (One book per "
 "directory, assumes every ebook file is the same book in a different format)"
@@ -7082,7 +7142,7 @@ msgstr ""
 "adresář představuje jednu knihu a soubory v něm jsou různé formáty té samé "
 "knihy)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:90
 msgid ""
 "Add books from directories, including sub directories (Multiple books per "
 "directory, assumes every ebook file is a different book)"
@@ -7090,99 +7150,115 @@ msgstr ""
 "Přidat knihy z adresárů, včetně podadresářů (vícero knih v jednom adresáři, "
 "předpokládá se že každý soubor představuje jednu knihu)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:93
 msgid "Add Empty book. (Book entry with no formats)"
 msgstr "Přidat prázdnou knihu. (Položka knihy bez žádných formátů)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:102
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
 msgid "Save to disk"
 msgstr "Uložit na disk"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Save to disk in a single directory"
 msgstr "Uložit na disk v jednom adresáři"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:106
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:402
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:394
 msgid "Save only %s format to disk"
 msgstr "Uložit jen formát %s na disk"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:110
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:397
 msgid "Save only %s format to disk in a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:119
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
 msgid "View"
 msgstr "Zobrazit"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:121
 msgid "View specific format"
 msgstr "Zobrazit určitý formát"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:127
 msgid "Remove selected books"
 msgstr "Smazat vybrané knihy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:129
 msgid "Remove files of a specific format from selected books.."
 msgstr "Odstranit soubory se zvoleným formátem z označených knih"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:132
 msgid "Remove all formats from selected books, except..."
 msgstr ""
 "Odstranit všechny soubory se zvoleným formátem z označených knih, mimo..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:135
 msgid "Remove covers from selected books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:138
 msgid "Remove matching books from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:155
 msgid "Convert individually"
 msgstr "Převést Individuálně"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:157
 msgid "Bulk convert"
 msgstr "Převést dávkově"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:161
 msgid "Create catalog of books in your calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:169
 msgid "Run welcome wizard"
 msgstr "Spustit uvítacího průvodce"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:205
 msgid "Similar books..."
 msgstr "Podobné knihy..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:237
 msgid "Add books to library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:234
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:241
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:253
 msgid "Manage collections"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:328
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:333
 msgid "Cover Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:351
 msgid "Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:372
+msgid "version"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:373
+msgid "created by Kovid Goyal"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:391
+msgid "Connected "
+msgstr "Připojeno "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:400
+msgid "Update found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:454
 msgid "Book Details"
 msgstr ""
 
@@ -7266,29 +7342,29 @@ msgid "Rating"
 msgstr "Hodnocení"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:324
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1084
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr "Kniha <font face=\"serif\">%s</font> z %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:674
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1176
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1182
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:886
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:885
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:890
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1156
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1162
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1165
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr ""
 
@@ -7332,11 +7408,11 @@ msgstr ""
 msgid "Restore default layout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:524
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:525
 msgid "Not allowed"
 msgstr "Nedovolené"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:526
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
@@ -7535,155 +7611,163 @@ msgstr "skuste restartovat počítač."
 msgid "try deleting the file"
 msgstr "pokuste se vymazat smazat soubor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:247
 msgid "calibre"
 msgstr "calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:249
 msgid "&Restrict to:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:250
 msgid ""
 "Books display will be restricted to those matching the selected saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:251
 msgid "set in ui.py"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:252
 msgid "Advanced search"
 msgstr "Rozšířené vyhledávání"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
 msgid "Alt+S"
 msgstr "Alt+S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
 msgid "&Search:"
 msgstr "&Hledat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
 msgid ""
 "<p>Search the list of books by title, author, publisher, tags, comments, "
 "etc.<br><br>Words separated by spaces are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
 msgid "Reset Quick Search"
 msgstr "Zrušit rychlé vyhledávání"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
-msgid "Choose saved search or enter name for new saved search"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
 msgid "Copy current search text (instead of search name)"
 msgstr "Zkopírovat právě hledaný text (namísto hledání názvu)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
 msgid "Save current search under the name shown in the box"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
 msgid "Delete current saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
 msgid "Add books"
 msgstr "Přidat knihy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
 msgid "A"
 msgstr "A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
 msgid "Remove books"
 msgstr "Odstranit knihy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
 msgid "Del"
 msgstr "Del"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
 msgid "Edit meta information"
 msgstr "Upravit Metadata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
 msgid "E"
 msgstr "E"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
 msgid "Merge book records"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
 msgid "M"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
 msgid "Send to device"
 msgstr "Odeslat do zařízení"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
 msgid "S"
 msgstr "S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
 msgid "Fetch news"
 msgstr "Stáhnout zprávy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
 msgid "Convert E-books"
 msgstr "Převést knihy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
 msgid "C"
 msgstr "C"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
 msgid "V"
 msgstr "V"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
 msgid "Open containing folder"
 msgstr "Otevřít nadřazený adresář"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
 msgid "Show book details"
 msgstr "Zobrazit podrobnosti o knize"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
 msgid "Books by same author"
 msgstr "Knihy od stejného autora"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
 msgid "Books in this series"
 msgstr "Knihy v této sérii"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
 msgid "Books by this publisher"
 msgstr "Knihy od tohoto vydavatele"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
 msgid "Books with the same tags"
 msgstr "Knihy se stejnými tagy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
 msgid "Configure calibre"
 msgstr "Nastavit calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
 msgid "Ctrl+P"
 msgstr "Ctrl+P"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
+msgid "Help"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
+msgid "Browse the calibre User Manual"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
+msgid "F1"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:20
 msgid ""
 "Redirect console output to a dialog window (both stdout and stderr). Useful "
@@ -7712,32 +7796,36 @@ msgstr "Kniha nemá ani název ani ISBN"
 msgid "No matches found for this book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:91
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:262
 msgid "Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:313
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:315
 msgid "The selected search will be <b>permanently deleted</b>. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:357
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr "Vyhledávání (pro rozšířené vyhledávání klikněte na tlačítko vlevo)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:392
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:398
 msgid "Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:406
+msgid "Choose saved search or enter name for new saved search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:47
 msgid "({0} of {1})"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:53
 msgid "(all books)"
 msgstr "Všechny knihy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:55
 msgid "({0} of all)"
 msgstr ""
 
@@ -7860,18 +7948,31 @@ msgstr ""
 msgid "Sort by average rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:775
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:772
+msgid "Set the sort order for entries in the Tag Browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:778
 msgid "Match all"
 msgstr "Porovnat vše"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:775
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:778
 msgid "Match any"
 msgstr "Najít kterékoliv"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:783
+msgid ""
+"When selecting multiple entries in the Tag Browser match any or all of them"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:787
 msgid "Manage &user categories"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:790
+msgid "Add your own categories to the Tag Browser"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182
 msgid "Convert book %d of %d (%s)"
@@ -7897,15 +7998,15 @@ msgstr ""
 msgid "Queueing "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:239
 msgid "Fetch news from "
 msgstr "Stáhnout zprávy z "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:301
 msgid "Convert existing"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:302
 msgid ""
 "The following books have already been converted to %s format. Do you wish to "
 "reconvert them?"
@@ -7919,53 +8020,45 @@ msgstr "&Obnovit"
 msgid "&Donate to support calibre"
 msgstr "&Přispějte na vývoj calibre."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:168
 msgid "&Eject connected device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:173
 msgid "&Restart"
 msgstr "&Restart"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:206
-msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
-msgstr "<p>Nápovědu najdete: <a href=\"%s\">User Manual</a><br>"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:212
-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/ui.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:227
 msgid "Calibre Quick Start Guide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:389
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:381
 msgid "Cannot configure"
 msgstr "Nemůžu nastavit"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:377
 msgid "Cannot configure while there are running jobs."
 msgstr "Nastavení není možné změnit dokud neproběhne zpracování všech úloh"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:382
 msgid "Cannot configure before calibre is restarted."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:425
 msgid "No detailed info available"
 msgstr "Bližší informace nejsou dostupné"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:426
 msgid "No detailed information is available for books on the device."
 msgstr "Bližší informace o knihách v tomto zařízení nejsou dostupné"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:486
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:478
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:506
 msgid "Conversion Error"
 msgstr "Chyba převodu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:487
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:479
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using third party tools."
@@ -7973,54 +8066,47 @@ msgstr ""
 "<p>Nelze převést: %s<p> Kniha je chráněna pomocí <a href=\"%s\">DRM</a>. "
 "Před převodem nejprve musíte odstranit DRM pomocí nástroje třetí strany."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:492
 msgid "Recipe Disabled"
 msgstr "Zdroj zakázán"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:507
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:547
 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."
+"you find it useful, please consider donating to support its development. "
+"Your donation helps keep calibre development going."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:573
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr "Prpbíha zpracování úloh. Opravdu chcete program ukončit?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:576
 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/ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 msgid "WARNING: Active jobs"
 msgstr "UPOZORNĚNÍ: Probíhá zpracování úloh."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:640
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:633
 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/update.py:52
-msgid ""
-"<span style=\"color:red; font-weight:bold\">Latest version: <a "
-"href=\"%s\">%s</a></span>"
-msgstr ""
-"<span style=\"color:red; font-weight:bold\">Poslední verze: <a "
-"href=\"%s\">%s</a></span>"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/update.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:56
 msgid "Update available"
 msgstr "Aktualizace dostupná"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/update.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:57
 msgid ""
 "%s has been updated to version %s. See the <a href=\"http://calibre-"
 "ebook.com/whats-new\">new features</a>. Visit the download page?"
@@ -8503,29 +8589,25 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:270
 msgid ""
 "Library\n"
-"%d\n"
-"books"
+"%d books"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:271
 msgid ""
 "Reader\n"
-"%s\n"
-"available"
+"%s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:272
 msgid ""
 "Card A\n"
-"%s\n"
-"available"
+"%s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:273
 msgid ""
 "Card B\n"
-"%s\n"
-"available"
+"%s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:277
@@ -8548,35 +8630,39 @@ msgstr ""
 msgid "Books located at"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:306
+msgid "free"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:557
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:558
 msgid "Upper Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:559
 msgid "Lower Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:560
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:561
 msgid "Title Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:974
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:983
 msgid "Drag to resize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1015
 msgid "Show"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1012
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1022
 msgid "Hide"
 msgstr ""
 
@@ -9848,89 +9934,89 @@ msgstr "Neznámý zdroj zpráv"
 msgid "The \"%s\" recipe needs a username and password."
 msgstr "\"%s\" zdroj musí obsahovat jméno a heslo."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:706
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:708
 msgid "Download finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:708
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:710
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:714
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:716
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:716
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:718
 msgid " from "
 msgstr " od "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:718
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:720
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:807
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:809
 msgid "Could not fetch article. Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:828
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:830
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:833
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:835
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:839
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:841
 msgid "Trying to download cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:841
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:922
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:924
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:938
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:940
 msgid "Feeds downloaded to %s"
 msgstr "Stáhnout zdroje z %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:948
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:950
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:960
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
 msgid "Downloading cover from %s"
 msgstr "Stahování obálky z %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1002
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1190
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1192
 msgid "Untitled Article"
 msgstr "Nepojmenovaný článek"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1261
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1263
 msgid "Article downloaded: %s"
 msgstr "Článek stažen: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1272
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1274
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1289
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1291
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1436
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1438
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1452
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1454
 msgid ""
 "You do not have permission to download this issue. Either your subscription "
 "has expired or you have exceeded the maximum allowed downloads for today."
@@ -11121,6 +11207,9 @@ msgstr "Nestahovat kaskádové styly."
 #~ "<p>Pro další nápovědu nevštivte <a "
 #~ "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
 
+#~ 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>"
+
 #~ msgid "Device database corrupted"
 #~ msgstr "Databáze zařízení je poškozená"
 
@@ -11230,3 +11319,13 @@ msgstr "Nestahovat kaskádové styly."
 
 #~ msgid "Click to turn off Cover Browsing"
 #~ msgstr "Kliknutím zavřete prohlížeč obálek"
+
+#~ msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
+#~ msgstr "<p>Nápovědu najdete: <a href=\"%s\">User Manual</a><br>"
+
+#~ msgid ""
+#~ "<span style=\"color:red; font-weight:bold\">Latest version: <a "
+#~ "href=\"%s\">%s</a></span>"
+#~ msgstr ""
+#~ "<span style=\"color:red; font-weight:bold\">Poslední verze: <a "
+#~ "href=\"%s\">%s</a></span>"
diff --git a/src/calibre/translations/da.po b/src/calibre/translations/da.po
index f5f78efbe3..1901f82293 100644
--- a/src/calibre/translations/da.po
+++ b/src/calibre/translations/da.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-05-21 22:47+0000\n"
-"PO-Revision-Date: 2010-05-21 07:18+0000\n"
-"Last-Translator: Kovid Goyal <Unknown>\n"
+"POT-Creation-Date: 2010-07-10 16:12+0000\n"
+"PO-Revision-Date: 2010-07-13 22:11+0000\n"
+"Last-Translator: Glenn <Unknown>\n"
 "Language-Team: Danish <da@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: 2010-05-22 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-07-15 03:34+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
@@ -23,39 +23,40 @@ msgstr "Gør absolut ingenting"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:72
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:54
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:75
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:71
 #: /home/kovid/work/calibre/src/calibre/devices/prs500/books.py:267
-#: /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/driver.py:204
-#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:98
-#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:101
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:492
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:398
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:97
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:100
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/metadata.py:56
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:428
 #: /home/kovid/work/calibre/src/calibre/ebooks/fb2/input.py:67
 #: /home/kovid/work/calibre/src/calibre/ebooks/fb2/input.py:69
-#: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:329
-#: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:332
+#: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:335
+#: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:338
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1894
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1896
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:24
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:230
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:261
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:264
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:364
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:235
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:276
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:279
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:390
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:20
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:21
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/ereader.py:36
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/ereader.py:61
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fb2.py:46
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:317
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:36
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:62
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:64
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:118
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:120
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:329
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:444
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:912
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:66
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:125
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:945
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1057
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdb.py:39
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:28
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pml.py:23
@@ -71,9 +72,9 @@ msgstr "Gør absolut ingenting"
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:818
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:49
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:51
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:909
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:914
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:980
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:911
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:916
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:982
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:137
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:139
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:108
@@ -97,50 +98,53 @@ msgstr "Gør absolut ingenting"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/rotate.py:63
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/split.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/split.py:82
-#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:87
-#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:88
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:97
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:233
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:279
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:286
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:170
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:177
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:21
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:107
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:574
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:583
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:123
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:158
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:460
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:173
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:419
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:441
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:969
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1096
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1694
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1697
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:814
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:817
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:22
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:899
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:908
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1191
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1194
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:481
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:362
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:882
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1060
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:92
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:185
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:311
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:213
 #: /home/kovid/work/calibre/src/calibre/library/database.py:913
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:248
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:260
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:680
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:717
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1111
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1113
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1235
-#: /home/kovid/work/calibre/src/calibre/library/server.py:671
-#: /home/kovid/work/calibre/src/calibre/library/server.py:747
-#: /home/kovid/work/calibre/src/calibre/library/server.py:794
-#: /home/kovid/work/calibre/src/calibre/utils/localization.py:114
-#: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:45
-#: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:63
-#: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:335
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:347
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:950
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1019
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1620
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1622
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1744
+#: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:268
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:134
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:137
+#: /home/kovid/work/calibre/src/calibre/library/server/xml.py:68
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:115
+#: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:46
+#: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:64
+#: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:78
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/collection.py:47
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/collection.py:50
 msgid "Unknown"
@@ -148,7 +152,7 @@ msgstr "Ukendt"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64
 msgid "Base"
-msgstr "Base"
+msgstr "Grund"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:172
 msgid "File type"
@@ -158,90 +162,91 @@ msgstr "Filtype"
 msgid "Metadata reader"
 msgstr "Metadatalæser"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:237
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:235
 msgid "Metadata writer"
 msgstr "Metadataskriver"
 
-#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:267
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:263
 msgid "Catalog generator"
 msgstr "Katalog generator"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:15
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:16
 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 ""
-"Følg alle lokale links i en HTML-fil og pak dem ned i en ZIP-fil. Dette "
-"plugin bliver kørt hver gang du tilføjer en HTML-fil til biblioteket."
+"Følg alle lokale henvisninger i en HTML-fil og pak alle filerne ned i en ZIP-"
+"fil. Dette udvidelsesmodul bliver kørt hver gang du tilføjer en HTML-fil til "
+"biblioteket."
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:50
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:52
 msgid ""
 "Character encoding for the input HTML files. Common choices include: cp1252, "
 "latin1, iso-8859-1 and utf-8."
 msgstr ""
-"Tegnsæt for kilde HTML filerne. Typiske valg inkluderer: cp1252, latin1, iso-"
+"Tegnsæt for kilde HTML-filerne. Typiske valg inkluderer: cp1252, latin1, iso-"
 "8859-1 og utf-8."
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:57
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:59
 msgid ""
 "Create a PMLZ archive containing the PML file and all images in the "
 "directory pmlname_img or images. This plugin is run every time you add a PML "
 "file to the library."
 msgstr ""
-"Lav et PMLZ arkiv, der indeholder PML filen og alle billeder i biblioteket "
-"pmlname_img eller billeder. Dette plugin kører hver gang du tilføjer en PML "
-"fil til biblioteket"
+"Lav et PMLZ-arkiv, der indeholder PML-filen og alle billeder i biblioteket "
+"pmlname_img eller billeder. Dette udvidelsesmodul kører hver gang du "
+"tilføjer en PML-fil til biblioteket."
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:89
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:93
 msgid "Extract cover from comic files"
 msgstr "Udtræk forside fra tegneserie-filer"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:116
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:127
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:139
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:149
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:159
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:170
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:180
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:190
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:200
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:210
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:220
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:231
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:242
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:254
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:275
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:286
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:296
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:306
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:120
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:131
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:153
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:163
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:174
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:184
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:194
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:204
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:214
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:224
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:235
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:246
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:258
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:279
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:290
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:300
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:310
 msgid "Read metadata from %s files"
-msgstr "Læser metadata fra %s filer"
+msgstr "Læser metadata fra %s filerne"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:265
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:269
 msgid "Read metadata from ebooks in RAR archives"
-msgstr "Læser metadata fra ebøger i rar-arkiver"
+msgstr "Læser metadata fra e-bøger i rar-arkiver"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:317
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:321
 msgid "Read metadata from ebooks in ZIP archives"
-msgstr "Læser metadata fra ebøger i zip-arkiver"
+msgstr "Læser metadata fra e-bøger i zip-arkiver"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:328
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:338
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:348
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:370
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:381
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:391
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:334
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:344
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:354
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:376
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:387
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:397
 msgid "Set metadata in %s files"
-msgstr "Gemmer metadata i %s filer"
+msgstr "Gemmer metadata i %s filerne"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:359
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:365
 msgid "Set metadata from %s files"
 msgstr "Sæt metadata fra %s filer"
 
 #: /home/kovid/work/calibre/src/calibre/customize/conversion.py:102
 msgid "Conversion Input"
-msgstr "Konverterings input"
+msgstr "Konvertering input"
 
 #: /home/kovid/work/calibre/src/calibre/customize/conversion.py:125
 msgid ""
@@ -250,9 +255,9 @@ msgid ""
 "useful for documents that do not declare an encoding or that have erroneous "
 "encoding declarations."
 msgstr ""
-"Angiv tegnsættet for kildedokumentet. Hvis denne valgmulighed er angivet, "
-"vil den overskrive tegnsæt angivet af dokumentet. Især nyttig til dokumenter "
-"der ikke oplyser et tegnsæt eller har fejlagtige oplysninger om tegnsættet."
+"Angiv tegnsættet for kildedokumentet. Hvis denne valgmulighed vælges, vil "
+"dokumentets tegnsætsvalg overskrives. Især nyttig til dokumenter, hvor "
+"tegnsæt ikke er valgt eller har fejlagtige tegnsætsvalg."
 
 #: /home/kovid/work/calibre/src/calibre/customize/conversion.py:241
 msgid "Conversion Output"
@@ -263,124 +268,126 @@ msgid ""
 "If specified, the output plugin will try to create output that is as human "
 "readable as possible. May not have any effect for some output plugins."
 msgstr ""
-"Hvis angivet, vil output pluginet prøve at generere output der er så læsbart "
-"som muligt. Vil muligvis ikke have virkning visse output plugins."
+"Hvis angivet, vil output-udvidelsesmodul prøve at generere output, der er så "
+"læsbart som muligt. Vil muligvis ikke have virkning for visse output-"
+"udvidelsesmoduler."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:45
 msgid "Input profile"
-msgstr "Input profil"
+msgstr "Input-profil"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:49
 msgid ""
 "This profile tries to provide sane defaults and is useful if you know "
 "nothing about the input document."
 msgstr ""
-"Denne profil prøver at levere fornuftige standardværdier og er brugbart, "
-"hvis du intet aner om kildedokumentet."
+"Denne profil prøver at levere fornuftige standardværdier og er brugbar, hvis "
+"du intet aner om kildedokumentet."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:57
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:258
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:412
 msgid ""
 "This profile is intended for the SONY PRS line. The 500/505/600/700 etc."
 msgstr ""
-"Denne profil er forbeholdt SONY's PRS linje. Model 500/505/600/700 etc."
+"Denne profil er forbeholdt SONY's PRS produktlinje. Model 500/505/600/700 "
+"etc."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:69
 msgid "This profile is intended for the SONY PRS 300."
 msgstr "Denne profil er forbeholdt SONY's PRS-300."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:78
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:292
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:447
 msgid "This profile is intended for the SONY PRS-900."
 msgstr "Denne profil er forbeholdt SONY's PRS-900."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:86
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:322
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:477
 msgid "This profile is intended for the Microsoft Reader."
 msgstr "Denne profil er beregnet for Microsoft Reader"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:97
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:333
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:488
 msgid "This profile is intended for the Mobipocket books."
 msgstr "Denne profil er beregnet til Mobipocket-bøgerne"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:110
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:346
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:501
 msgid "This profile is intended for the Hanlin V3 and its clones."
-msgstr "Denne profil er beregnet til Hanlin V3 og dens kloner."
+msgstr "Denne profil er beregnet til Hanlin V3 og kloner."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:122
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:358
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:513
 msgid "This profile is intended for the Hanlin V5 and its clones."
 msgstr "Denne profil er forbeholdt Harlin V5 og kloner."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:132
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:366
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:521
 msgid "This profile is intended for the Cybook G3."
 msgstr "Denne profil er beregnet til Cybook G3."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:145
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:379
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:534
 msgid "This profile is intended for the Cybook Opus."
-msgstr "Denne profil er beregnet for Cybook Opus."
+msgstr "Denne profil er beregnet til Cybook Opus."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:157
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:390
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:545
 msgid "This profile is intended for the Amazon Kindle."
 msgstr "Denne profil er beregnet til Amazon Kindle."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:169
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:425
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:580
 msgid "This profile is intended for the Irex Illiad."
-msgstr "Denne profil er beregnet for Irex Illiad."
+msgstr "Denne profil er beregnet til Irex Illiad."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:181
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:438
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:593
 msgid "This profile is intended for the IRex Digital Reader 1000."
-msgstr "Denne profil er beregnet for IRex Digital Reader 1000."
+msgstr "Denne profil er beregnet til IRex Digital Reader 1000."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:194
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:452
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:607
 msgid "This profile is intended for the IRex Digital Reader 800."
 msgstr "Denne profil er beregnet til IRex Digital Reader 800"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:206
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:466
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:621
 msgid "This profile is intended for the B&N Nook."
 msgstr "Denne profil er forbeholdt B&N's Nook."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:226
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:228
 msgid "Output profile"
-msgstr "Ouput profil"
+msgstr "Ouput-profil"
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:230
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:232
 msgid ""
 "This profile tries to provide sane defaults and is useful if you want to "
 "produce a document intended to be read at a computer or on a range of "
 "devices."
 msgstr ""
-"Denne profil prøver at levere fornuftige standardværdier og er egnet hvis du "
-"vil producere et dokument beregnet til at blive læst på en computer eller et "
-"udvalg af enheder."
+"Denne profil prøver at give bredt anvendelige standardværdier og er egnet, "
+"hvis du vil generere et dokument beregnet til at blive læst på computere "
+"eller flere enhedstyper."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:248
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:257
 msgid ""
 "Intended for the iPad and similar devices with a resolution of 768x1024"
-msgstr ""
+msgstr "Beregnet til iPad og lignende enheder med en opløsning på 768x1024"
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:271
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:425
 msgid "This profile is intended for the Kobo Reader."
-msgstr "Denne profil er tiltænkt Kobo Reader."
+msgstr "Denne profil er beregnet til Kobo Reader."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:283
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:438
 msgid "This profile is intended for the SONY PRS-300."
-msgstr "Denne profil er forbeholdt SONY's PRS-300."
+msgstr "Denne profil er beregnet til SONY's PRS-300."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:301
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:456
 msgid "This profile is intended for the 5-inch JetBook."
-msgstr "Denne profil er beregnet for 5\" JetBook."
+msgstr "Denne profil er beregnet til 5\" JetBook."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:310
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:465
 msgid ""
 "This profile is intended for the SONY PRS line. The 500/505/700 etc, in "
 "landscape mode. Mainly useful for comics."
@@ -388,100 +395,176 @@ msgstr ""
 "Denne profil er beregnet til SONYs PRS serie. PRS 500/505/700 etc. i "
 "liggende tilstand. Hovedsageligt egnet til tegneserier."
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:408
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:563
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr "Denne profil er beregnet til Amazon Kindle DX."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:31
-msgid "Installed plugins"
-msgstr "Installerede plugins"
-
 #: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
-msgid "Mapping for filetype plugins"
-msgstr "Opsætning af filtype plugins"
+msgid "Installed plugins"
+msgstr "Installerede udvidelsesmoduler"
 
 #: /home/kovid/work/calibre/src/calibre/customize/ui.py:33
-msgid "Local plugin customization"
-msgstr "Tilpasning af lokalt plugin"
+msgid "Mapping for filetype plugins"
+msgstr "Opsætning af filtype udvidelsesmoduler"
 
 #: /home/kovid/work/calibre/src/calibre/customize/ui.py:34
+msgid "Local plugin customization"
+msgstr "Tilpasning af lokal udvidelsesmodul"
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
 msgid "Disabled plugins"
-msgstr "Deaktiverede plugins"
+msgstr "Deaktiverede udvidelsesmoduler"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:77
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
+msgid "Enabled plugins"
+msgstr "Aktiverede udvidelsesmoduler"
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:84
 msgid "No valid plugin found in "
-msgstr "Intet gyldigt plugin fundet i "
+msgstr "Intet gyldigt udvidelsesmodul fundet i "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:278
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:468
 msgid "Initialization of plugin %s failed with traceback:"
-msgstr "Initialiseringen af plugin %s slog fejl med følgende backtrace:"
+msgstr ""
+"Initialiseringen af udvidelsesmodul %s fejlede med følgende backtrace:"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:433
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
 msgid ""
 "    %prog options\n"
 "\n"
 "    Customize calibre by loading external plugins.\n"
 "    "
 msgstr ""
-"    %prog valgmuligheder\n"
+"    %prog options\n"
 "\n"
-"    Tilpas Calibre ved at indlæse eksterne plugins.\n"
+"    Tilpas Calibre ved at indlæse eksterne udvidelsesmoduler.\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:439
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr ""
-"Tilføj et plugin ved at angive stien til ZIP-filen hvori det er gemt."
+"Tilføj et udvidelsesmodul ved at angive stien til ZIP-filen, hvori det er "
+"gemt."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:441
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
-"Fjerner det angivne brugerdefinerede plugin. Har ingen effekt på indbyggede "
-"plugins"
+"Fjerner det angivne brugerdefinerede udvidelsesmodul. Har ingen effekt på "
+"indbyggede udvidelser"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:443
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:511
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
 msgstr ""
-"Tilpas plugin. Angiv pluginets navn og en tekststreng med tilpasningerne "
-"adskilt af et komma."
+"Brugertilpas udvidelsesmodul. Angiv udvidelsesmodulnavn og "
+"tilpasningstekststrenge adskilt af kommaer."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:445
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:513
 msgid "List all installed plugins"
-msgstr "Vis alle installerede plugins"
+msgstr "Vis alle installerede udvidelsesmoduler"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:447
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Enable the named plugin"
-msgstr "Aktiver det angivne plugin"
+msgstr "Aktivér det angivne udvidelsesmodul"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:449
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Disable the named plugin"
-msgstr "Deaktiver det angivne plugin"
+msgstr "Deaktivér det angivne udvidelsesmodul"
 
 #: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:13
 msgid "Communicate with Android phones."
-msgstr "Kommuniker med Android telefoner"
+msgstr "Kommunikér med Android telefoner"
 
-#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:39
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:45
 msgid ""
 "Comma separated list of directories to send e-books to on the device. The "
 "first one that exists will be used"
 msgstr ""
-"Komma separeret liste af biblioteker for at sende ebooks til enheden. Den "
-"første der er, vil blive brugt."
+"Komma separeret liste af mapper til at sende e-bøger til, på enheden. Den "
+"første som findes, vil blive brugt."
 
-#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:67
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:77
 msgid "Communicate with S60 phones."
+msgstr "Kommunikér med S60 telefoner."
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:87
+msgid "Communicate with iTunes/iBooks."
+msgstr "Kommunikér med iTunes/iBooks."
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:93
+msgid "Apple device detected, launching iTunes, please wait ..."
+msgstr "Apple-enhed fundet, starter iTunes, vent venligst..."
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:246
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:249
+msgid "Updating device metadata listing..."
+msgstr "Opdaterer enhed metadata listen..."
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:323
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:362
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:921
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:957
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2791
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2830
+msgid "%d of %d"
+msgstr "%d af %d"
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:962
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2836
+msgid "finished"
+msgstr "afsluttet"
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:544
+msgid "Use Series as Category in iTunes/iBooks"
+msgstr "Brug Series som kategori i iTunes/iBooks"
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:546
+msgid "Cache covers from iTunes/iBooks"
+msgstr "Cache omslag fra iTunes/iBooks"
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:558
+msgid ""
+"Some books not found in iTunes database.\n"
+"Delete using the iBooks app.\n"
+"Click 'Show Details' for a list."
 msgstr ""
+"Nogle bøger ikke fundet i iTunes database.\n"
+"Sletter ved at anvende iBooks app.\n"
+"Klik 'Show Details' for en liste."
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:886
+msgid ""
+"Some cover art could not be converted.\n"
+"Click 'Show Details' for a list."
+msgstr ""
+"Nogle omslagsdele kunne ikke konverteres.\n"
+"Klik 'Show Details' for en liste."
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2471
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:807
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:813
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:841
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:239
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:167
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:180
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1504
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:128
+msgid "News"
+msgstr "Nyheder"
+
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2698
+msgid "Communicate with iTunes."
+msgstr "Kommunikér med iTunes."
 
 #: /home/kovid/work/calibre/src/calibre/devices/binatone/driver.py:17
 msgid "Communicate with the Binatone Readme eBook reader."
-msgstr "Kommuniker med Binatone Readme Ebook læser."
+msgstr "Kommunikér med Binatone Readme Ebook læser."
 
 #: /home/kovid/work/calibre/src/calibre/devices/blackberry/driver.py:13
 msgid "Communicate with the Blackberry smart phone."
-msgstr "Kommuniker med Blackberry smartphone."
+msgstr "Kommunikér med Blackberry smartphone."
 
 #: /home/kovid/work/calibre/src/calibre/devices/blackberry/driver.py:14
 #: /home/kovid/work/calibre/src/calibre/devices/nuut2/driver.py:18
@@ -491,11 +574,19 @@ msgstr "Kovid Goyal"
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybook/driver.py:22
 msgid "Communicate with the Cybook Gen 3 / Opus eBook reader."
-msgstr "Kommuniker med Cybook Gen 3 / Opus eBook reader"
+msgstr "Kommunikér med Cybook Gen 3 / Opus eBook reader"
 
 #: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:24
 msgid "Communicate with the EB600 eBook reader."
-msgstr "Kommuniker med EB600 e-bogslæseren."
+msgstr "Kommunikér med EB600 e-bogslæseren."
+
+#: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:193
+msgid "Communicate with the Astak Mentor EB600"
+msgstr "Kommunikér med Astak Mentor EB600"
+
+#: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:216
+msgid "Communicate with the PocketBook 301 reader."
+msgstr "Kommunikér med PocketBook 301 læseren."
 
 #: /home/kovid/work/calibre/src/calibre/devices/edge/driver.py:17
 msgid "Entourage Edge"
@@ -503,188 +594,226 @@ msgstr "Entourage Edge"
 
 #: /home/kovid/work/calibre/src/calibre/devices/edge/driver.py:18
 msgid "Communicate with the Entourage Edge."
-msgstr "Kommuniker med Entuorage Edge."
+msgstr "Kommunikér med Entuorage Edge."
 
 #: /home/kovid/work/calibre/src/calibre/devices/eslick/driver.py:16
 msgid "Communicate with the ESlick eBook reader."
-msgstr "Kommuniker med ESlick eBogs læser"
+msgstr "Kommunikér med ESlick eBogs læser."
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:19
-msgid "Communicate with Hanlin V3 eBook readers."
-msgstr "Kommuniker med Hanlin V3 eBook reader."
+#: /home/kovid/work/calibre/src/calibre/devices/eslick/driver.py:49
+msgid "Communicate with the Sigmatek eBook reader."
+msgstr "Kommunikér med Sigmatek eBook læseren."
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:95
-msgid "Communicate with Hanlin V5 eBook readers."
-msgstr "Kommuniker med Hanlin V5 eBook reader."
-
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:114
-msgid "Communicate with the BOOX eBook reader."
-msgstr "Kommuniker med BOOX eBook reader."
-
-#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:18
-msgid "Communicate with the Hanvon N520 eBook reader."
-msgstr "Kommuniker med Hanvon N520 eBook reader."
-
-#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:41
-msgid "Communicate with the SpringDesign Alex eBook reader."
-msgstr "Kommuniker med SpringDesign Alex ebogs læser."
-
-#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:57
-msgid "Communicate with the Azbooka"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:70
-msgid "Communicate with the Elonex EB 511 eBook reader."
-msgstr "Kommuniker med Elonex EB 511 eBook reader."
-
-#: /home/kovid/work/calibre/src/calibre/devices/iliad/driver.py:16
-msgid "Communicate with the IRex Iliad eBook reader."
-msgstr "Kommuniker med IRex Iliad e-bogslæseren."
-
-#: /home/kovid/work/calibre/src/calibre/devices/iliad/driver.py:17
-#: /home/kovid/work/calibre/src/calibre/devices/irexdr/driver.py:18
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:29
-msgid "John Schember"
-msgstr "John Schember"
+#: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:16
+#: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:30
+msgid "Use an arbitrary folder as a device."
+msgstr "Vælg en ønsket mappe som enhed."
 
+#: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:26
 #: /home/kovid/work/calibre/src/calibre/devices/interface.py:23
 msgid "Device Interface"
 msgstr "Enhedsgrænseflade"
 
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:19
+msgid "Communicate with Hanlin V3 eBook readers."
+msgstr "Kommunikér med Hanlin V3 eBook læser."
+
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:87
+msgid "Communicate with Hanlin V5 eBook readers."
+msgstr "Kommunikér med Hanlin V5 eBook læser."
+
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:106
+msgid "Communicate with the BOOX eBook reader."
+msgstr "Kommunikér med BOOX eBook læser."
+
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:123
+msgid ""
+"Comma separated list of directories to send e-books to on the device. The "
+"first one that exists will be used."
+msgstr ""
+"Komma separeret liste af mapper til at sende e-bøger til på enheden. Den "
+"første først fundne anvendes."
+
+#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:18
+msgid "Communicate with the Hanvon N520 eBook reader."
+msgstr "Kommunikér med Hanvon N520 eBook læser."
+
+#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:40
+msgid "Communicate with The Book reader."
+msgstr "Kommunikér med The Book læser."
+
+#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:51
+msgid "Communicate with the SpringDesign Alex eBook reader."
+msgstr "Kommunikér med SpringDesign Alex eBook læser."
+
+#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:67
+msgid "Communicate with the Azbooka"
+msgstr "Kommunikér med Azbooka"
+
+#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:80
+msgid "Communicate with the Elonex EB 511 eBook reader."
+msgstr "Kommunikér med Elonex EB 511 eBook læser."
+
+#: /home/kovid/work/calibre/src/calibre/devices/iliad/driver.py:16
+msgid "Communicate with the IRex Iliad eBook reader."
+msgstr "Kommunikér med IRex Iliad eBook læser."
+
+#: /home/kovid/work/calibre/src/calibre/devices/iliad/driver.py:17
+#: /home/kovid/work/calibre/src/calibre/devices/irexdr/driver.py:18
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:38
+msgid "John Schember"
+msgstr "John Schember"
+
 #: /home/kovid/work/calibre/src/calibre/devices/irexdr/driver.py:16
 msgid "Communicate with the IRex Digital Reader 1000 eBook reader."
-msgstr "Kommuniker med IRex Digital Reader 1000 e-bogslæseren."
+msgstr "Kommunikér med IRex Digital Reader 1000 eBook læser."
 
 #: /home/kovid/work/calibre/src/calibre/devices/irexdr/driver.py:42
 msgid "Communicate with the IRex Digital Reader 800"
-msgstr "Kommuniker med IRex Digital Reader 800"
+msgstr "Kommunikér med IRex Digital Reader 800"
 
 #: /home/kovid/work/calibre/src/calibre/devices/iriver/driver.py:15
 msgid "Communicate with the Iriver Story reader."
-msgstr "Kommuniker med Iriver læser"
+msgstr "Kommunikér med Iriver Story læser."
 
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:20
 msgid "Communicate with the JetBook eBook reader."
-msgstr "Kommuniker med JetBook e-bogslæseren."
+msgstr "Kommunikér med JetBook eBook læser."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:21
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:42
 msgid "Communicate with the Kindle eBook reader."
-msgstr "Kommuniker med Kindle e-bogslæseren."
+msgstr "Kommunikér med Kindle e-bogslæser."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:152
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:169
 msgid "Communicate with the Kindle 2 eBook reader."
-msgstr "Kommuniker med Kindle 2 e-bogslæseren."
+msgstr "Kommunikér med Kindle 2 e-bogslæser."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:162
+#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:210
 msgid "Communicate with the Kindle DX eBook reader."
-msgstr "Kommuniker med Kindle DX eBook reader."
+msgstr "Kommunikér med Kindle DX e-bogslæser."
 
-#: /home/kovid/work/calibre/src/calibre/devices/misc.py:15
-msgid "Communicate with the Palm Pre"
-msgstr "Kommuniker med Palm Pre."
-
-#: /home/kovid/work/calibre/src/calibre/devices/misc.py:35
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:22
 msgid "Communicate with the Kobo Reader"
-msgstr "Kommuniker med Kobo Reader"
+msgstr "Kommunikér med Kobo Reader"
 
-#: /home/kovid/work/calibre/src/calibre/devices/misc.py:56
-msgid "Communicate with the Booq Avant"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:17
-msgid "Communicate with the Nokia 770 internet tablet."
-msgstr "Kommuniker med Nokia 770 internet tablet"
-
-#: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:40
-msgid "Communicate with the Nokia 810 internet tablet."
-msgstr "Kommuniker med Nokia 810 internet tablet."
-
-#: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:20
-msgid "The Nook"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:21
-msgid "Communicate with the Nook eBook reader."
-msgstr "Kommuniker med Nook ebogs læser."
-
-#: /home/kovid/work/calibre/src/calibre/devices/nuut2/driver.py:17
-msgid "Communicate with the Nuut2 eBook reader."
-msgstr "Kommuniker med Nuut2 eBogs læser"
-
-#: /home/kovid/work/calibre/src/calibre/devices/prs500/driver.py:89
-msgid "Communicate with the Sony PRS-500 eBook reader."
-msgstr "Kommuniker med Sony PRS-500 e-bogslæseren."
-
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:150
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:104
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:107
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:110
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:121
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:44
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:47
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:50
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:51
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:54
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:57
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:159
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:64
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:67
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:70
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:80
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:89
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:139
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:162
 msgid "Getting list of books on device..."
 msgstr "Henter liste over bøger på enheden..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:26
-msgid "Communicate with the Sony PRS-300/505/500 eBook reader."
-msgstr ""
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:219
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:263
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:246
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:264
+msgid "Removing books from device..."
+msgstr "Fjerner bøger fra enhed..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:58
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:267
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:274
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:271
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:276
+msgid "Removing books from device metadata listing..."
+msgstr "Fjerner bøger fra enhedens metadataliste..."
+
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:313
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:210
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:240
+msgid "Adding books to device metadata listing..."
+msgstr "Tilføjer bøger til enhedens metadataliste..."
+
+#: /home/kovid/work/calibre/src/calibre/devices/misc.py:15
+msgid "Communicate with the Palm Pre"
+msgstr "Kommunikér med Palm Pre"
+
+#: /home/kovid/work/calibre/src/calibre/devices/misc.py:35
+msgid "Communicate with the Booq Avant"
+msgstr "Kommunikér med Booq Avant"
+
+#: /home/kovid/work/calibre/src/calibre/devices/misc.py:55
+msgid "Communicate with the Sweex MM300"
+msgstr "Kommunikér med Sweex MM300"
+
+#: /home/kovid/work/calibre/src/calibre/devices/misc.py:75
+msgid "Communicate with the Pandigital Novel"
+msgstr "Kommunikér med Pandigital Novel"
+
+#: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:17
+msgid "Communicate with the Nokia 770 internet tablet."
+msgstr "Kommunikér med Nokia 770 internet tablet."
+
+#: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:40
+msgid "Communicate with the Nokia 810 internet tablet."
+msgstr "Kommunikér med Nokia 810 internet tablet."
+
+#: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:74
+msgid "Communicate with the Nokia E52"
+msgstr "Kommunikér med Nokia E52"
+
+#: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:20
+msgid "The Nook"
+msgstr "Nook e-bogen"
+
+#: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:21
+msgid "Communicate with the Nook eBook reader."
+msgstr "Kommunikér med Nook e-bogslæser."
+
+#: /home/kovid/work/calibre/src/calibre/devices/nuut2/driver.py:17
+msgid "Communicate with the Nuut2 eBook reader."
+msgstr "Kommunikér med Nuut2 e-bogslæser."
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs500/driver.py:89
+msgid "Communicate with the Sony PRS-500 eBook reader."
+msgstr "Kommunikér med Sony PRS-500 e-bogslæser."
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:22
+msgid "Communicate with all the Sony eBook readers."
+msgstr "Kommunikér med alle Sony eBook læsere."
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
 "device. Possibilities include: "
 msgstr ""
+"Komma separeret liste af metadata felter som oversættes til collections på "
+"enheden. Muligheder omfatter: "
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:149
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:151
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:115
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:117
-msgid "Transferring books to device..."
-msgstr "Overfører bøger til enhed..."
-
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:189
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:196
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:144
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:161
-msgid "Removing books from device..."
-msgstr "Fjerner bøger fra enhed..."
-
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:224
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:176
-msgid "Sending metadata to device..."
-msgstr "Sender metadata til enhed..."
-
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:230
-msgid "Communicate with the Sony PRS-600/700/900 eBook reader."
-msgstr ""
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:140
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:68
+msgid "Unnamed"
+msgstr "Unavngivet"
 
 #: /home/kovid/work/calibre/src/calibre/devices/sne/driver.py:17
 msgid "Communicate with the Samsung SNE eBook reader."
-msgstr ""
+msgstr "Kommunikér med Samsung SNE ebogslæser."
 
 #: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:11
 msgid "Communicate with the Teclast K3 reader."
-msgstr "Kommuniker med med Teclast K3 ebogs læser."
+msgstr "Kommunikér med Teclast K3 læser."
 
-#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:45
+#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:37
 msgid "Communicate with the Newsmy reader."
-msgstr ""
+msgstr "Kommunikér med Newsmy læser."
 
-#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:60
+#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:49
 msgid "Communicate with the iPapyrus reader."
-msgstr ""
+msgstr "Kommunikér med iPapyrus læser."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:252
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:245
 msgid "Unable to detect the %s disk drive. Try rebooting."
 msgstr "Kan ikke finde diskdrevet %s. Prøv at genstarte."
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:425
 msgid "Unable to detect the %s mount point. Try rebooting."
-msgstr "Ikke muligt at registere %s monteringspunktet. Prøv at genstarte."
+msgstr "Ikke muligt at finde %s diskvolumet. Prøv at genstarte."
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:490
 msgid "Unable to detect the %s disk drive."
@@ -692,95 +821,88 @@ msgstr "Kan ikke finde diskdrevet %s."
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:583
 msgid "Could not find mount helper: %s."
-msgstr "Kunne ikke finde monteringshjælperen: %s"
+msgstr "Kunne ikke finde diskvolume monteringshjælper: %s."
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:595
 msgid ""
 "Unable to detect the %s disk drive. Your  kernel is probably exporting a "
 "deprecated version of SYSFS."
 msgstr ""
-"Kan ikke finde diskdrevet %s. Din kernel benytter formentligt en forringet "
+"Kan ikke finde diskdrevet %s. Din OS-kerne benytter formentlig en forældet "
 "version af SYSFS."
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:603
 msgid "Unable to mount main memory (Error code: %d)"
-msgstr "Kan ikke monterer hovedhukommelsen (Fejlkode: %d)"
+msgstr "Kan ikke benytte arbejdshukommelsen (Fejlkode: %d)"
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:740
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:742
 msgid "The reader has no storage card in this slot."
-msgstr "E-bogslæseren har intet lagerkort i denne sokkel."
+msgstr "E-bogslæseren har intet hukommelseskort i denne sokkel."
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:744
 msgid "Selected slot: %s is not supported."
 msgstr "Den valgte sokkel: %s er ikke understøttet."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:777
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:773
 msgid "There is insufficient free space in main memory"
-msgstr "Der er ikke tilstrækkelig plads i hovedhukommelsen"
+msgstr "Der er ikke tilstrækkelig plads i arbejdshukommelsen"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:779
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:781
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:775
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:777
 msgid "There is insufficient free space on the storage card"
 msgstr "Der er ikke tilstrækkelig plads på hukommelseskortet"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:811
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:817
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:842
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:240
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:151
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:589
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:995
-msgid "News"
-msgstr "Nyheder"
-
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:12
 msgid "Configure Device"
-msgstr "Konfigurer Enhed"
+msgstr "Konfigurer enhed"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:28
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:37
 msgid "settings for device drivers"
-msgstr "indstillinger for enhedsdrivere"
+msgstr "enhedsdriver indstillinger"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:30
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:39
 msgid "Ordered list of formats the device will accept"
 msgstr "Sorteret liste over formater, enheden vil acceptere"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:32
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:41
 msgid "Place files in sub directories if the device supports them"
-msgstr "Placer filerne i undermapper, hvis enheden understøtter dem"
+msgstr "Placér filerne i undermapper, hvis enheden understøtter dette"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:34
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:43
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:81
 msgid "Read metadata from files on device"
 msgstr "Læs metadata fra filerne på enheden"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:36
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:45
+msgid "Use author sort instead of author"
+msgstr "Anvende forfattersortering istedet for forfatter"
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:47
 msgid "Template to control how books are saved"
-msgstr "Skabelon til kontrol om hvordan bøger bliver gemt"
+msgstr "Skabelon til at styre hvordan bøger bliver gemt"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:50
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:84
 msgid "Extra customization"
-msgstr "Ekstra tilpasning"
+msgstr "Yderligere tilpasning"
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:28
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:37
 msgid "Communicate with an eBook reader."
-msgstr "Kommuniker med en e-bogslæser."
+msgstr "Kommunikér med en e-bogslæser."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:36
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:53
 msgid "Get device information..."
 msgstr "Hent enhedsoplysninger..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:132
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:140
-msgid "Adding books to device metadata listing..."
-msgstr "Føjer bøger til enhedens metadataliste..."
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:192
+msgid "Transferring books to device..."
+msgstr "Overfører bøger til enhed..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:165
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:170
-msgid "Removing books from device metadata listing..."
-msgstr "Fjerner bøger fra enhedens metadataliste..."
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:307
+msgid "Sending metadata to device..."
+msgstr "Sender metadata til enhed..."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:41
 msgid "%prog [options] mybook.chm"
@@ -788,7 +910,7 @@ msgstr "%prog [valgmulighed] minbog.chm"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:42
 msgid "Output directory. Defaults to current directory"
-msgstr "Output mappe. Gør nuværrende mappe til standard."
+msgstr "Output-mappe. Gør nuværende mappe til standard."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:45
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:589
@@ -798,7 +920,7 @@ msgstr "Angiv bogens titel"
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:47
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:591
 msgid "Set sort key for the title"
-msgstr ""
+msgstr "Vælg sorteringsnøgle til titel"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:49
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:593
@@ -808,46 +930,47 @@ msgstr "Angiv forfatter"
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:51
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:595
 msgid "Set sort key for the author"
-msgstr ""
+msgstr "Vælg sorteringsnøgle for forfatter"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:53
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:597
 msgid "The category this book belongs to. E.g.: History"
-msgstr "Kategorien denne bog tilhører. Ex.: Historie"
+msgstr "Kategorien denne bog tilhører. F.eks.: Historie"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:56
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:600
 msgid "Path to a graphic that will be set as this files' thumbnail"
 msgstr ""
+"Sti til billedgrafik som vil blive valgt til disse filers miniaturebillede"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:59
 msgid "Path to a txt file containing a comment."
-msgstr ""
+msgstr "Sti til en .txt-fil indeholdende en kommentar."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:62
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:607
 msgid "Extract thumbnail from LRF file"
-msgstr "Udpak miniature fra LRF fil"
+msgstr "Udpak miniaturebillede fra LRF-fil"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:63
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:608
 msgid "Set the publisher"
-msgstr "Sæt forlag"
+msgstr "Angiv forlag"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:64
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:609
 msgid "Set the book classification"
-msgstr ""
+msgstr "Vælg bog klassifikation"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:65
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:610
 msgid "Set the book creator"
-msgstr "Sæt bog forfatteren"
+msgstr "Angiv bogskaber"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:66
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:611
 msgid "Set the book producer"
-msgstr "Sæt bog producer"
+msgstr "Angiv bogproducer"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:68
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:613
@@ -855,8 +978,8 @@ 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 ""
-"Udpak forsidebillede fra LRF fil. Bemærk at LRF formatet ikke inkluderer "
-"forsidebillede, så Calibre vil gætte hvilket billede er det korrekte."
+"Udpak omslag fra LRF-fil. Bemærk at LRF-formatet ikke inkluderer omslag, så "
+"Calibre vil gætte på hvilket omslag der skal anvendes."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:70
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:615
@@ -873,7 +996,7 @@ msgstr "Genereret %s"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:204
 msgid "Failed %s"
-msgstr "%s slog fejl"
+msgstr "%s feljede"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:261
 msgid ""
@@ -881,7 +1004,7 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"Kunne ikke behandle tegneserien: \n"
+"Behandlingen af tegneserien fejlede: \n"
 "\n"
 "%s"
 
@@ -891,20 +1014,20 @@ msgid ""
 "of less than 256 may result in blurred text on your device if you are "
 "creating your comics in EPUB format."
 msgstr ""
-"Antal farver for konvertering til gråtoner. Standard: %default. Værdier "
-"mindre end 256 kan forårsage utydelig tekst på din enhed, hvis du benytter "
-"EPUB formatet til dine tegneserier."
+"Antallet af farver til gråtonekonvertering. Standardværdi: %default. Færre "
+"end 256 værdier kan forårsage utydelig tekst på din enhed, hvis du benytter "
+"EPUB-formatet til f.eks. tegneserier."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:283
 msgid ""
 "Disable normalize (improve contrast) color range for pictures. Default: False"
 msgstr ""
-"Deaktiver normalisering (forbedrer kontrasten) af farveområdet for billeder. "
+"Deaktivér normalisering (forbedrer kontrast) af farveområdet for billeder. "
 "Standardværdi: Falsk"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:286
 msgid "Maintain picture aspect ratio. Default is to fill the screen."
-msgstr "Bevar billedformat. Standardværdien er at fylde skærmen."
+msgstr "Bevar aspektforhold. Standardværdien er at fylde skærmen."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:288
 msgid "Disable sharpening."
@@ -920,14 +1043,14 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:293
 msgid "Don't split landscape images into two portrait images"
-msgstr "Split ikke landskabsbilleder op i to portrætbilleder"
+msgstr "Del ikke landskabsbilleder op i to portrætbilleder"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:295
 msgid ""
 "Keep aspect ratio and scale image using screen height as image width for "
 "viewing in landscape mode."
 msgstr ""
-"Behold højde-bredde-forhold og skaler billede med skærmens højde som "
+"Behold aspektforhold og skalér billede ved anvendelse af skærmens højde som "
 "billedets bredde for visning i landskabstilstand."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:298
@@ -935,15 +1058,15 @@ msgid ""
 "Used for right-to-left publications like manga. Causes landscape pages to be "
 "split into portrait pages from right to left."
 msgstr ""
-"Bruges til højre-mod-venstre publikationer som ex. manga. Forårsager at "
-"landskabssider splittes i portrætsider fra højre mod venstre."
+"Bruges til højre-mod-venstre publikationer som f.eks. manga. Forårsager at "
+"landskabssider deles i portrætsider fra højre mod venstre."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:302
 msgid ""
 "Enable Despeckle. Reduces speckle noise. May greatly increase processing "
 "time."
 msgstr ""
-"Aktiver Despeckle. Reducerer billedstøj. Kan forøge behandlingstid "
+"Aktivér Despeckle. Reducerer billedstøj. Kan forøge behandlingstid "
 "væsentligt."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:305
@@ -951,8 +1074,8 @@ msgid ""
 "Don't sort the files found in the comic alphabetically by name. Instead use "
 "the order they were added to the comic."
 msgstr ""
-"Sortér ikke de fundne filer i en tegneserie alfabetisk efter navn. Benyt i "
-"stedet for den rækkefølge de blev tilføjet til tegneserien."
+"Sortér ikke de fundne filer i en tegneserie efter alfabetisk navneorden. "
+"Benyt i stedet for den rækkefølge de blev tilføjet til tegneserien."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:309
 msgid ""
@@ -960,17 +1083,17 @@ msgid ""
 "experiment to see which format gives you optimal size and look on your "
 "device."
 msgstr ""
-"Formatet som billeder i den endelige ebog bliver konverteret til. Du kan "
-"eksperimentere med dette for at se hvilket format der giver den optimale "
-"størrelse af ebogen, samt det bedste resultat på netop din type ebogslæser."
+"Formatet billederne i den endelige e-bog bliver konverteret til. Du kan "
+"eksperimentere med dette for at se, hvilket format der giver den optimale "
+"størrelse og bedste resultat på din e-bogslæser."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:313
 msgid "Apply no processing to the image"
-msgstr "Processer ikke billedet"
+msgstr "Processér ikke billedet"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:315
 msgid "Do not convert the image to grayscale (black and white)"
-msgstr ""
+msgstr "Konvertér ikke billedet til gråtoner (sort og hvid)"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:452
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:463
@@ -1002,6 +1125,28 @@ msgid ""
 "\n"
 "For full documentation of the conversion system see\n"
 msgstr ""
+"input_file output_file [options]\n"
+"\n"
+"Konverter en e-bog fra et format til et andet.\n"
+"\n"
+"input_file er input og output_file er output. Begge skal specificeres som de "
+"2 første argumenter til kommandoen.\n"
+"\n"
+"Output e-bogsformatet gættes ud fra output_file filtype endelsen. "
+"Output_file kan også være i det specielle format .EXT hvor EXT er output "
+"filtype endelsen. I dette tilfælde, vil navnet på output-filen blive bestemt "
+"ud fra navnet på input-filen. Bemærk at filnavnene ikke må starte med "
+"bindestreg. Slutteligt, hvis output_file ikke har en filtype endelse, bliver "
+"den tolket som en mappe og en \"åben e-bog\" (OEB) bestående af HTML-filer "
+"bliver skrevet til den mappe. Disse filer er de filer der normalt ville være "
+"overført til output udvidelsesmodulet.\n"
+"\n"
+"Efter specificering af input- og output-fil, kan konverteringen justeres ved "
+"at specificere forskellige muligheder. De tilgængelige muligheder afhænger "
+"af input- og output-typen. For at få hjælp til disse, skal input- og output-"
+"filen specificeres, hvorefter -h muligheden vælges.\n"
+"\n"
+"For fuld dokumentation af konverteringssystemet se\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:97
 msgid "INPUT OPTIONS"
@@ -1025,7 +1170,7 @@ msgstr "Valgmuligheder til styring af udseendet af outputtet"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:135
 msgid "Control auto-detection of document structure."
-msgstr "Kontroller automatisk bestemmelse af dokumentets struktur"
+msgstr "Styring af auto-detektion af dokumentets struktur."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:145
 msgid ""
@@ -1033,17 +1178,17 @@ msgid ""
 "source file has a Table of Contents, it will be used in preference to the "
 "automatically generated one."
 msgstr ""
-"Kontroller den automatiske generering af en indholdsfortegnelse. Som "
-"standard vil kildefilens indholdsfortegnelse blive foretrukket (hvis en "
-"sådan eksisterer) frem for en autogenereret."
+"Styring af den automatiske generering af indholdsfortegnelsen. Som "
+"udgangspunkt vil en evt. indholdsfortegnelse i kildefilen blive foretrukket, "
+"fremfor en selvgenereret."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:155
 msgid "Options to set metadata in the output"
-msgstr "Muligheder for at fastsætte metadata i output"
+msgstr "Muligheder for at angive metadata i output"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:158
 msgid "Options to help with debugging the conversion"
-msgstr "Muligheder der kan hjælpe med fejlfinding af konverteringen"
+msgstr "Muligheder der kan hjælpe med konverteringsfejlfinding"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:183
 msgid "List builtin recipes"
@@ -1055,7 +1200,7 @@ msgstr "Output gemt til"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:95
 msgid "Level of verbosity. Specify multiple times for greater verbosity."
-msgstr "Niveau af ordrigdom. Anfør flere gange for større ordrigdom."
+msgstr "Ordrigdomsniveau. Vælg flere gange for større ordrigdom."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:102
 msgid ""
@@ -1063,9 +1208,9 @@ msgid ""
 "specified directory. Useful if you are unsure at which stage of the "
 "conversion process a bug is occurring."
 msgstr ""
-"Gem output fra forskellige niveauer i konverteringsprocessen til den "
-"specificerede mappe. Nyttig, såfremt du er usikker på hvornår i "
-"konverteringsprocessen en given fejl sker."
+"Gem output fra forskellige trin i konverteringen til den valgte mappe. "
+"Nyttig, såfremt du er usikker på, hvornår i konverteringen en given fejl "
+"sker."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:111
 msgid ""
@@ -1074,9 +1219,9 @@ msgid ""
 "For example resolution dependent lengths (i.e. lengths in pixels). Choices "
 "are:"
 msgstr ""
-"Specificér input profil. Input profilen vejleder systemet i hvorledes "
-"forskellig information i input dokumentet skal tolkes. Ex. længder der "
-"afhænger af opløsning (e.x længde i pixel). Valgmuigheder er:"
+"Vælg input-profil. Input-profilen vejleder systemet i hvorledes forskellig "
+"information i input-dokumentet skal tolkes. F.eks. opløsningsafhængige "
+"længder (f.eks. pixel-længde). Valgmuligheder er:"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:122
 msgid ""
@@ -1085,10 +1230,10 @@ msgid ""
 "cases, an output profile is required to produce documents that will work on "
 "a device. For example EPUB on the SONY reader. Choices are:"
 msgstr ""
-"Specificér output profil. Output profilen vejleder konverteringsprocessen i "
-"hvordan det færdige dokument bedst optimeres for den specifikke enhed. I "
-"visse tilfælde kræves en output profil for at skabe dokumenter der vil "
-"fungere på en given enhed. Ex. EPUB på SONY ebogslæseren. Valgmuligheder er:"
+"Vælg output-profil. Output-profilen vejleder konverteringssystemet så det "
+"færdige dokument bedst optimeres til den givne enhed. I visse tilfælde "
+"kræves en output-profil for at skabe dokumenter, der vil fungere på en given "
+"enhed. F.eks. EPUB på SONY e-bogslæseren. Valgmuligheder er:"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:133
 msgid ""
@@ -1097,6 +1242,11 @@ msgid ""
 "fonts in the output bigger and vice versa. By default, the base font size is "
 "chosen based on the output profile you chose."
 msgstr ""
+"Grundskriftstørrelse i pkt (typografiske punkter). Alle skriftstørrelser i "
+"den dannede bog vil blive skaleret på baggrund af denne størrelse. Ved at "
+"vælge en større skriftstype, kan du gøre skriftstørrelsen i det konverterede "
+"større og omvendt. Grundskriftstørrelsen bliver valgt med udgangspunkt i den "
+"output-profil du vælger."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:143
 msgid ""
@@ -1106,16 +1256,24 @@ msgid ""
 "algorithm uses these sizes to intelligently rescale fonts. The default is to "
 "use a mapping based on the output profile you chose."
 msgstr ""
+"Afbildning fra CSS skriftsnavne til skriftsstørrelser i pkt (typografiske "
+"punkter). Et eksempel valg er 12,12,14,16,18,20,22,24. Disse afbildninger er "
+"skriftsstørrelserne for xx-small til xx-large, med den sidste størrelser for "
+"store skriftsstørrelser. Skrifternes reskaleringsalgoritme anvender disse "
+"størrelser som målestok. Standardværdien fås fra en output-profil du "
+"tidligere har valgt."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:155
 msgid "Disable all rescaling of font sizes."
-msgstr "Deaktiver alle skalering af skrifttyper"
+msgstr "Deaktivér alle reskaleringer af skriftsstørrelser"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:162
 msgid ""
 "The line height in pts. Controls spacing between consecutive lines of text. "
 "By default no line height manipulation is performed."
 msgstr ""
+"Linjehøjden i pkt (typografiske punkter). Styrer også tekstlinjeafstanden. "
+"Som udgangspunkt foretages der ikke linjehøjdeændringer."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:170
 msgid ""
@@ -1124,6 +1282,10 @@ msgid ""
 "page and other artifacts. This option will extract the content from the "
 "tables and present it in a linear fashion."
 msgstr ""
+"Nogle dårligt designede dokumenter anvender tabeller til layout-styring af "
+"sidens tekstelementer. Når disse dokumenter konverteres, har de ofte "
+"tekstelementer som løber ud af skærmen eller andre mærkværdigheder. Dette "
+"valg vil fjerne tabellen og sammensætte tekstelementerne i læserækkefølge."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:180
 msgid ""
@@ -1142,8 +1304,8 @@ msgid ""
 "entry."
 msgstr ""
 "XPath udtryk, der angiver alle tags, der skal tilføjes til "
-"indholdsfortegnelsen på andet niveau. Hvert element bliver tilføjet under "
-"det foregående første niveau-element."
+"indholdsfortegnelsen på andet niveau. Anden niveau-indgange bliver tilføjet "
+"under de respektive første niveau-indgange."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:197
 msgid ""
@@ -1152,8 +1314,8 @@ msgid ""
 "entry."
 msgstr ""
 "XPath udtryk, der angiver alle tags, der skal tilføjes til "
-"indholdsfortegnelsen på tredje niveau. Hvert element bliver tilføjet under "
-"det foregående andet niveau-element."
+"indholdsfortegnelsen på tredje niveau. Tredje niveau-indgange bliver "
+"tilføjet under de respektive anden niveau-indgange."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:205
 msgid ""
@@ -1167,15 +1329,15 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:213
 msgid "Don't add auto-detected chapters to the Table of Contents."
-msgstr "Tilføj ikke automatisk genkendte kapitler til indholdsfortegnelsen."
+msgstr "Tilføj ikke auto-detekterede kapitler til indholdsfortegnelsen."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:220
 msgid ""
 "If fewer than this number of chapters is detected, then links are added to "
 "the Table of Contents. Default: %default"
 msgstr ""
-"Hvis færre end dette antal kapitler er genkendt, bliver links tilføjet til "
-"indholdsfortegnelsen. Standardværdi: %default"
+"Hvis færre end dette antal kapitler er genkendt, bliver henvisninger "
+"tilføjet til indholdsfortegnelsen. Standardværdi: %default"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:227
 msgid ""
@@ -1183,12 +1345,17 @@ msgid ""
 "is: %default. Links are only added to the TOC if less than the threshold "
 "number of chapters were detected."
 msgstr ""
+"Maksimalt antal isatte henvisninger i indholdsfortegnelsen. Vælg 0 for "
+"deaktivering. Standardværdi er: %default. Henvisninger tilføjes kun til "
+"indholdsfortegnelsen hvis mindre end kapitelantal tærsklen."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:235
 msgid ""
 "Remove entries from the Table of Contents whose titles match the specified "
 "regular expression. Matching entries and all their children are removed."
 msgstr ""
+"Fjern indgange i indholdfortegnelse med titler, der matcher det valgte "
+"regulære udtryk. Matchende indgange og alle deres underindgange fjernes."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:246
 msgid ""
@@ -1199,6 +1366,12 @@ msgid ""
 "detection, use the expression \"/\". See the XPath Tutorial in the calibre "
 "User Manual for further help on using this feature."
 msgstr ""
+"Et XPath-udtryk til af finde kapitel titler. Standard er at anvende <h1> "
+"eller <h2> tags som indeholder ordene \"chapter\",\"book\",\"section\" eller "
+"\"part\" som kapiteltitler såvel som enhver tag der har class=\"chapter\". "
+"Udtrykket skal som evalueringsresultat give en elementliste. For at "
+"deaktivere kapiteldetektering vælg udtrkket \"/\". Se XPath Tutorial i "
+"calibre User Manual for yderligere hjælp af denne funktion."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:260
 msgid ""
@@ -1207,10 +1380,10 @@ msgid ""
 "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 ""
-"Angiv hvordan genkendte kapitler skal fremhæves. Værdien \"pagebreak\" vil "
-"indsætte sideskift før kapitler. Værdien \"rule\" vil indsætte en ny linje "
-"før kapitler. Værdien \"none\" vil deaktivere fremhævningen og værdien "
-"\"both\" vil bruge både side skift og linjer til fremhævning af kapitler."
+"Angiv hvordan detekterede kapitler skal fremhæves. Værdien \"pagebreak\" vil "
+"indsætte sideskift før kapitler. Værdien \"rule\" vil indsætte et linjeskift "
+"før kapitler. Værdien \"none\" vil deaktivere fremhævningen - og værdien "
+"\"both\" vil bruge både sideskift og linjeskift som kapitelfremhævning."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:270
 msgid ""
@@ -1218,31 +1391,42 @@ msgid ""
 "the style rules from the source file, so it can be used to override those "
 "rules."
 msgstr ""
+"Enten stien til en CSS stylesheet eller rå CSS. Dette CSS vil blive tilføjet "
+"til stilreglerne fra kildefilen, så de tilsidesætte de oprindelige "
+"stilregler."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:279
 msgid ""
 "An XPath expression. Page breaks are inserted before the specified elements."
-msgstr ""
+msgstr "Et XPath-udtryk. Sideskift isættes før de angivne emner."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:285
 msgid ""
 "Set the top margin in pts. Default is %default. Note: 72 pts equals 1 inch"
 msgstr ""
+"Indstil topmargin i pkt (typografiske punkter). Standard er %default. "
+"Bemærk: 72 pkt svarer til 1 US tomme"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:290
 msgid ""
 "Set the bottom margin in pts. Default is %default. Note: 72 pts equals 1 inch"
 msgstr ""
+"Indstil bundmargin i pkt (typografiske punkter). Default er %default. Note: "
+"72 pkt svarer til 1 US tomme"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:295
 msgid ""
 "Set the left margin in pts. Default is %default. Note: 72 pts equals 1 inch"
 msgstr ""
+"Indstil venstre margin i pkt (typografiske punkter). Standard er %default. "
+"Bemærk: 72 pkt svarer til 1 US tomme"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:300
 msgid ""
 "Set the right margin in pts. Default is %default. Note: 72 pts equals 1 inch"
 msgstr ""
+"Indstil højre margin i pkt (typografiske punkter). Standard er %default. "
+"Bemærk: 72 pkt svarer til 1 US tomme"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:306
 msgid ""
@@ -1252,6 +1436,9 @@ msgid ""
 "\"original\" (the default) does not change justification in the source file. "
 "Note that only some output formats support justification."
 msgstr ""
+"Vælg afsnitsjustering. \"left\" giver venstrestillet tekst. \"justify\" "
+"giver centreret tekst. \"original\" (standard) - ingen ændring. Bemærk at "
+"kunnogle output-formater understøtter centreret tekst."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:316
 msgid ""
@@ -1259,6 +1446,9 @@ msgid ""
 "1.5em. Spacing removal will not work if the source file does not use "
 "paragraphs (<p> or <div> tags)."
 msgstr ""
+"Fjern afstand mellem afsnit. Der vælges også et indryk på 1,5em. Spacing "
+"removal will not work if the source file does not use paragraphs Valget har "
+"ikke effekt på kildefiler, som ikke indeholder <p> eller <div> tags."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:323
 msgid ""
@@ -1266,6 +1456,9 @@ msgid ""
 "paragraph indent, to ensure that paragraphs can be easily distinguished. "
 "This option controls the width of that indent."
 msgstr ""
+"Når calibre fjerner afstand mellem afsnit, isættes automatisk en "
+"afsnitsindryk, for at sikre let afsnitsgenkendelse. Valget styrer i så fald "
+"afsnitindrykkets størrelse."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:330
 msgid ""
@@ -1278,48 +1471,56 @@ msgid ""
 "Insert a blank line between paragraphs. Will not work if the source file "
 "does not use paragraphs (<p> or <div> tags)."
 msgstr ""
+"Håndhæv blank linje (=to linjeskift) mellem afsnit. Valget har ikke effekt "
+"på kildefiler, som ikke indeholder <p> eller <div> tags."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:343
 msgid ""
 "Remove the first image from the input ebook. Useful if the first image in "
 "the source file is a cover and you are specifying an external cover."
 msgstr ""
-"Fjern det første billede fra e-bogen. Brugbar hvis det første billede er et "
-"omslag og du angiver en eksternt omslag."
+"Fjern det første billede fra input e-bogen. Brugbart hvis det første billede "
+"er et omslag og du angiver en eksternt omslag."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:351
 msgid ""
 "Insert the book metadata at the start of the book. This is useful if your "
 "ebook reader does not support displaying/searching metadata directly."
 msgstr ""
+"Isæt metadata i starten af bogen. Dette er anvendeligt hvis din e-bogslæser "
+"ikke understøtter direkte visning eller søgning af metadata."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:359
 msgid ""
 "Attempt to detect and correct hard line breaks and other problems in the "
 "source file. This may make things worse, so use with care."
 msgstr ""
+"Prøv at detektere og korrigere hårde linjeskift og andre problemer i "
+"kildefilen. Dette kan gøre tingene værre, så brug det med forsigtighed."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:367
 msgid "Use a regular expression to try and remove the header."
-msgstr ""
+msgstr "Anvend et regulært udtryk til at fjerne side-header."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:374
 msgid "The regular expression to use to remove the header."
-msgstr ""
+msgstr "Regulært udtryk til at fjerne side-header."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:380
 msgid "Use a regular expression to try and remove the footer."
-msgstr ""
+msgstr "Anvend et regulært udtryk til at fjerne side-footer."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:387
 msgid "The regular expression to use to remove the footer."
-msgstr ""
+msgstr "Regulært udtryk til at fjerne side-footer."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:394
 msgid ""
 "Read metadata from the specified OPF file. Metadata read from this file will "
 "override any metadata in the source file."
 msgstr ""
+"Indlæs metadata fra den angivne OPF-fil. Metadata læsning fra denne fil vil "
+"tilsidesætte metadata i kildefilen."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:401
 msgid ""
@@ -1330,6 +1531,11 @@ msgid ""
 "by Chinese and Japanese for instance) the representation used by the largest "
 "number of people will be used (Chinese in the previous example)."
 msgstr ""
+"Translitterær unicode-tegn til en ASCII-repræsentation. Anvendes med "
+"forsigtighed. F.eks. vil det erstatte \"%s\" med \"Mikhail Gorbachiov\". "
+"Bemærk at der i mange tilfælde er flere mulige repræsentationer (f.eks. tegn "
+"delt mellem kinesisk og japansk). Den repræsentation der anvendes af flest "
+"mennesker anvendes (kinesisk - i det tidligere eksempel)."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:416
 msgid ""
@@ -1340,112 +1546,178 @@ msgid ""
 "corresponding pair of normal characters. This option will preserve them "
 "instead."
 msgstr ""
+"Bevar evt. ligaturer i input-dokumentet. En ligatur er en speciel skrivning "
+"af et par bogstaver såsom ff, fi, fl et cetera. De fleste e-bogslæsere "
+"understøtter ikke ligaturer i deres standardskriftstyper og de vil derfor "
+"ikke vises korrekt. Som standard vil calibre translitterære en ligatur til "
+"korresponderende par af normale bogstaver. Dette valg bibeholde ligaturer."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:428
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:38
 msgid "Set the title."
-msgstr ""
+msgstr "Angiv titlen."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:432
 msgid "Set the authors. Multiple authors should be separated by ampersands."
-msgstr ""
+msgstr "Angiv forfatterne. Flere forfattere skal separeres ampersand."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:437
 msgid "The version of the title to be used for sorting. "
-msgstr ""
+msgstr "Titelversion anvendt ved sortering. "
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:441
 msgid "String to be used when sorting by author. "
-msgstr ""
+msgstr "Forfatterversion anvendt ved sortering. "
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:445
 msgid "Set the cover to the specified file or URL"
-msgstr ""
+msgstr "Vælg omslaget via den angivne fil eller URL"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:449
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:54
 msgid "Set the ebook description."
-msgstr ""
+msgstr "Angiv e-bogsbeskrivelse."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:453
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:56
 msgid "Set the ebook publisher."
-msgstr ""
+msgstr "Angiv e-bogsforlaget."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:457
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:60
 msgid "Set the series this ebook belongs to."
-msgstr ""
+msgstr "Angiv e-bogens ønskede bogserie."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:461
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:62
 msgid "Set the index of the book in this series."
-msgstr ""
+msgstr "Angiv bogens indeks anvendt i bogserien."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:465
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:64
 msgid "Set the rating. Should be a number between 1 and 5."
-msgstr ""
+msgstr "Angiv vurdering. Skal være et heltal i intervallet 1 til 5."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:469
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:66
 msgid "Set the ISBN of the book."
-msgstr ""
+msgstr "Angiv bogens ISBN."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:473
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:68
 msgid "Set the tags for the book. Should be a comma separated list."
-msgstr ""
+msgstr "Angiv bogens mærker. Skal være en kommasepareret liste."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:477
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:70
 msgid "Set the book producer."
-msgstr ""
+msgstr "Angiv bogens bogens producer."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:481
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:72
 msgid "Set the language."
-msgstr ""
+msgstr "Vælg sprog."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:485
 msgid "Set the publication date."
-msgstr ""
+msgstr "Angiv publikationsdato."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:489
 msgid "Set the book timestamp (used by the date column in calibre)."
-msgstr ""
+msgstr "Angiv bogens tidsstempel (anvendes i datokolonnen i calibre)."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:589
 msgid "Could not find an ebook inside the archive"
-msgstr "Kunne ikke finde en e-bog inden i arkivet"
+msgstr "Kunne ikke finde en e-bog i arkivet"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:647
 msgid "Values of series index and rating must be numbers. Ignoring"
-msgstr ""
+msgstr "Serieindeks og vurdering skal være heltal. Ignoreres"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:654
 msgid "Failed to parse date/time"
-msgstr ""
+msgstr "Dato/tid parsningsfejl"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:802
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:809
 msgid "Converting input to HTML..."
-msgstr ""
+msgstr "Konvertér input til HTML..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:829
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:836
 msgid "Running transforms on ebook..."
-msgstr ""
+msgstr "Udfører transformationer på e-bog..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:916
+#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:923
 msgid "Creating"
-msgstr ""
+msgstr "Opretter"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:205
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/__init__.py:18
+msgid "ePub Fixer"
+msgstr "ePub-fixer"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/epubcheck.py:18
+msgid "Workaround epubcheck bugs"
+msgstr "Omgår epubcheck fejl"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/epubcheck.py:22
+msgid ""
+"Workarounds for bugs in the latest release of epubcheck. epubcheck reports "
+"many things as errors that are not actually errors. epub-fix will try to "
+"detect these and replace them with constructs that epubcheck likes. This may "
+"cause significant changes to your epub, complain to the epubcheck project."
+msgstr ""
+"Omgåelse af den seneste udgivelses epubcheck-fejl. epubcheck rapporterer "
+"mange ting som fejl som ikke er egentlige fejl. epub-fix vil prøve at "
+"detektere disse og erstatte dem med konstruktioner som epubcheck kan lide. "
+"Dette kan forårsage omfattende ændringer til din epub, klag til epubcheck-"
+"projektet."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:19
+msgid ""
+"%prog [options] file.epub\n"
+"\n"
+"Fix common problems in EPUB files that can cause them to be rejected by "
+"poorly designed publishing services.\n"
+"\n"
+"By default, no fixing is done and messages are printed out for each error "
+"detected. Use the options to control which errors are automatically fixed."
+msgstr ""
+"%prog [options] fil.epub\n"
+"\n"
+"Ordn almindelige problemer i EPUB-filer, som kan forårsage at de afvises af "
+"dårligt designede publikationvisningstjeneste.\n"
+"\n"
+"By default, no fixing is done and messages are printed out for each error "
+"detected. Use the options to control which errors are automatically fixed."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:50
+msgid "You must specify an epub file"
+msgstr "Du skal angive en epub-fil"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:17
+msgid "Fix unmanifested files"
+msgstr "Ordn filreferencer til manglende filer"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:21
+msgid ""
+"Fix unmanifested files. epub-fix can either add them to the manifest or "
+"delete them as specified by the delete unmanifested option."
+msgstr ""
+"Ordn filreferencer til manglende filer. epub-fix kan enten tilføje dem eller "
+"slette referencerne som angivet i \"slet filreferencer til manglende filer\"."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:32
+msgid "Delete unmanifested files instead of adding them to the manifest"
+msgstr "Slet filreferencer til manglende filer, istedet for at tilføje dem"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:56
 msgid ""
 "Extract the contents of the generated EPUB file to the specified directory. "
 "The contents of the directory are first deleted, so be careful."
 msgstr ""
+"Udpak indholdet af den genererede EPUB-fil til den valgte mappe. Advarsel: "
+"Indholdet af mappen vil blive slettet forinden."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:211
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:62
 msgid ""
 "Turn off splitting at page breaks. Normally, input files are automatically "
 "split at every page break into two files. This gives an output ebook that "
@@ -1453,35 +1725,44 @@ msgid ""
 "if your source file contains a very large number of page breaks, you should "
 "turn off splitting on page breaks."
 msgstr ""
-"Deaktiver deling ved sideskift. Normalt bliver inputfiler automatisk delt i "
-"to filer ved sideskift. Dette giver en output e-bog, der kan fortolkes "
-"hurtigt og bruger færre ressourcer. Imidlertid tager opdelingen tid så hvis "
-"din kildefil indeholder et højt antal sideskift, bør du deaktivere deling "
-"ved sideskift."
+"Deaktivér fildeling ved sideskift. Normalt bliver input-filer automatisk "
+"fildelt ved sideskift. Dette giver en output e-bog, der kan fortolkes "
+"hurtigt og bruger færre e-bogsressourcer. Hvis din kildefil indeholder et "
+"stort antal sideskift, bør du deaktivere fildeling ved sideskift."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:222
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:73
 msgid ""
 "Split all HTML files larger than this size (in KB). This is necessary as "
 "most EPUB readers cannot handle large file sizes. The default of %defaultKB "
 "is the size required for Adobe Digital Editions."
 msgstr ""
+"Del alle HTML-filer større end denne størrelse (i KB). Dette er nødvendigt "
+"da de fleste EPUB-læsere ikke kan håndtere store filstørrelser. "
+"Standardværdien %defaultKB er størrelsen krævet af Adobe Digital Editions."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:229
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:80
 msgid ""
 "Normally, if the input file has no cover and you don't specify one, a "
 "default cover is generated with the title, authors, etc. This option "
 "disables the generation of this cover."
 msgstr ""
+"Normalt, hvis input-filen ikke har et omslag og du ikke angiver et, vil et "
+"standard omslag genereres med titel, forfattere, osv. Denne valgmulighed "
+"deaktiverer genereringen af dette omslag."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:235
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:86
 msgid ""
 "Do not use SVG for the book cover. Use this option if your EPUB is going to "
-"be used ona  device that does not support SVG, like the iPhone or the "
+"be used on a device that does not support SVG, like the iPhone or the "
 "JetBook Lite. Without this option, such devices will display the cover as a "
 "blank page."
 msgstr ""
+"Anvend ikke SVG (Scalable Vector Graphics) til et e-bogsomslag. Anvend denne "
+"valgmulighed hvis din EPUB skal anvendes til en enhed som ikke understøtter "
+"SVG, som f.eks. iPhone eller JetBook Lite. Uden dette fravalg vil disse "
+"enheder blot vise omslaget som en blank side."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:243
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:94
 msgid ""
 "When using an SVG cover, this option will cause the cover to scale to cover "
 "the available screen area, but still preserve its aspect ratio (ratio of "
@@ -1489,16 +1770,26 @@ msgid ""
 "and bottom of the image, but the image will never be distorted. Without this "
 "option the image may be slightly distorted, but there will be no borders."
 msgstr ""
+"Når et SVG omslag anvendes, vil denne valgmulighed gøre at omslaget skaleres "
+"til skærmstørrelsen, men stadig bevare aspektforholdet (forholdet mellem "
+"bredde og højde). Dette betyder at der kan forekomme hvide flader ved "
+"siderne eller top og bund af illustationen, men det forvrænges. Uden denne "
+"valgmulighed vil billedet i en del tilfælde blive forvrænget, men skærmen "
+"vil fyldes ud."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:169
+msgid "Start"
+msgstr "Start"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/fb2/fb2ml.py:144
 #: /home/kovid/work/calibre/src/calibre/ebooks/rb/rbml.py:102
 #: /home/kovid/work/calibre/src/calibre/ebooks/txt/txtml.py:77
 msgid "Table of Contents:"
-msgstr ""
+msgstr "Indholdsfortegnelse"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/fb2/input.py:32
 msgid "Do not insert a Table of Contents at the beginning of the book."
-msgstr ""
+msgstr "Indsæt ikke indholdsfortegnelse i begyndelse af bogen."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:21
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/output.py:32
@@ -1506,34 +1797,46 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/rb/output.py:21
 #: /home/kovid/work/calibre/src/calibre/ebooks/txt/output.py:35
 msgid "Add Table of Contents to beginning of the book."
-msgstr ""
+msgstr "Tilføj indholdsfortegnelse til begyndelsen af bogen."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:243
+#: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:248
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
 "depth first."
 msgstr ""
+"Traversér henvisninger i HTML-filer bredde-først. Normalt traverseres de "
+"dybde-først."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:250
+#: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:255
 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. "
 "Default is %default."
 msgstr ""
+"Maksimalt rekursionsniveau når HTML-filers henvisninger følges. Skal være "
+"ikke-negativt. 0 betyder at ingen henvisninger i rod HTML-filen følges. "
+"Standardværdi er %default."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:259
+#: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:264
 msgid ""
 "Normally this input plugin re-arranges all the input files into a standard "
 "folder hierarchy. Only use this option if you know what you are doing as it "
 "can result in various nasty side effects in the rest of of the conversion "
 "pipeline."
 msgstr ""
+"Normalt vil dette input-udvidelsesmodul genarrangere alle input-filerne i en "
+"standard mappehierarki. Anvend kun denne valgmulighed hvis du ved hvad du "
+"gør, da valget kan have flere fæle sideeffekter i resten af "
+"konverteringstrinene."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:267
+#: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:272
 msgid ""
 "Average line length for line breaking if the HTML is from a previous partial "
 "conversion of a PDF file. Default is %default which disables this."
 msgstr ""
+"Ønsket middel linjelængde for HTML-linjeombrydning hvis HTML er fra en "
+"tidligere delkonvertering af en PDF-fil. Standardværdien er %default hvilket "
+"deaktiverer dette."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/from_any.py:47
 msgid "Creating LIT file from EPUB..."
@@ -1541,77 +1844,82 @@ msgstr "Skaber LIT-fil fra EPUB..."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:320
 msgid "\tBook Designer file detected."
-msgstr ""
+msgstr "\tBook Designer fil detekteret."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:322
 msgid "\tParsing HTML..."
-msgstr ""
+msgstr "\tParser HTML..."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:345
 msgid "\tBaen file detected. Re-parsing..."
-msgstr ""
+msgstr "\tBaen fil detekteret. Parsning genstartes..."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:361
 msgid "Written preprocessed HTML to "
-msgstr ""
+msgstr "Skrevet forbehandlet HTML til "
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:379
 msgid "Processing %s"
-msgstr ""
+msgstr "Behandler %s"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:393
 msgid "\tConverting to BBeB..."
-msgstr ""
+msgstr "\tKonverterer til BBeB..."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:539
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:552
 msgid "Could not parse file: %s"
-msgstr ""
+msgstr "Kunne ikke parse filen: %s"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:544
 msgid "%s is an empty file"
-msgstr ""
+msgstr "%s er en tom fil"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:564
 msgid "Failed to parse link %s %s"
-msgstr ""
+msgstr "Fejlede med at parse henvisning %s %s"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:608
 msgid "Cannot add link %s to TOC"
-msgstr ""
+msgstr "Kan ikke tilføje henvisning %s til indholdsfortegnelsen"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:957
 msgid "Unable to process image %s. Error: %s"
-msgstr ""
+msgstr "Kan ikke behandle billede %s. Fejl: %s"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1002
 msgid "Unable to process interlaced PNG %s"
-msgstr ""
+msgstr "Kan ikke behandle interlaced PNG %s"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1017
 msgid ""
 "Could not process image: %s\n"
 "%s"
 msgstr ""
+"Kunne ikke behandle billede: %s\n"
+"%s"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1772
 msgid ""
 "An error occurred while processing a table: %s. Ignoring table markup."
 msgstr ""
+"En fejl viste sig under behandling en tabel: %s. Ignorerer tabel opmærkning."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1774
 msgid ""
 "Bad table:\n"
 "%s"
 msgstr ""
+"Dårlig tabel:\n"
+"%s"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1796
 msgid "Table has cell that is too large"
-msgstr "En tabel har en celle der er for stor"
+msgstr "Tabellen har celler som er for store"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1862
 msgid "Could not read cover image: %s"
-msgstr "Kunne ikke læse forside billedet: %s"
+msgstr "Kunne ikke læse omslagsbillede: %s"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1865
 msgid "Cannot read from: %s"
@@ -1619,31 +1927,31 @@ msgstr "Kan ikke læse fra: %s"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1994
 msgid "Failed to process opf file"
-msgstr "Fejl ved forsøg på at læse opf fil"
+msgstr "Fejl ved forsøg på at læse opf-fil"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:136
 msgid ""
 "%prog book.lrf\n"
 "Convert an LRF file into an LRS (XML UTF-8 encoded) file"
 msgstr ""
-"%prog book.lrf\n"
-"Konverter en LRF fil til en LRS (XML UTF-8 kodet) fil"
+"%prog bog.lrf\n"
+"Konverterer en LRF-fil til en LRS-(XML UTF-8 kodet)-fil"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:137
 msgid "Output LRS file"
-msgstr "Output LRS fil"
+msgstr "Output LRS-fil"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:139
 msgid "Do not save embedded image and font files to disk"
-msgstr "Unlad at gemme inkluderede billed- og fontfiler til disk"
+msgstr "Undlad at gemme inkluderede billed- og skriftfiler til disk"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:158
 msgid "Parsing LRF..."
-msgstr "Læser LRF..."
+msgstr "Parser LRF..."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:161
 msgid "Creating XML..."
-msgstr "Skaber XML..."
+msgstr "Danner XML..."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:163
 msgid "LRS written to "
@@ -1651,32 +1959,32 @@ msgstr "LRS skrevet til "
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:267
 msgid "Could not read from thumbnail file:"
-msgstr ""
+msgstr "Kunne ikke læse miniaturebilledfil:"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:287
 msgid ""
 "%prog [options] file.lrs\n"
 "Compile an LRS file into an LRF file."
 msgstr ""
-"%prog [options] file.lrs\n"
-"Compilér en LRS file til en LRF fil."
+"%prog [options] fil.lrs\n"
+"Oversæt en LRS-fil til en LRF-fil."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:288
 msgid "Path to output file"
-msgstr "Sti til output fil"
+msgstr "Sti til output-fil"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:290
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:113
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:114
 msgid "Verbose processing"
 msgstr "Uddybende behandling"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:292
 msgid "Convert LRS to LRS, useful for debugging."
-msgstr "Konverter LRS til LRS, nyttigt for fejlfinding."
+msgstr "Konverter LRS til LRS, nyttigt ved fejlfinding."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:457
 msgid "Invalid LRF file. Could not set metadata."
-msgstr ""
+msgstr "Ugyldig LRF-fil. Kunne ikke lave metadata."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:582
 msgid ""
@@ -1686,17 +1994,17 @@ msgid ""
 "Show/edit the metadata in an LRF file.\n"
 "\n"
 msgstr ""
-"%prog [options] mybook.lrf\n"
+"%prog [options] minbog.lrf\n"
 "\n"
 "\n"
-"Vis/redigér metadata i en LRF fil.\n"
+"Vis/redigér metadata i en LRF-fil.\n"
 "\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:603
 msgid ""
 "Path to a txt file containing the comment to be stored in the lrf file."
 msgstr ""
-"Sti til en tekstfil der indeholder kommentaren der skal tilføjes lrf filen."
+"Sti til en .txt-fil der indeholder kommentaren, der skal tilføjes lrf-filen."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:90
 msgid "Enable autorotation of images that are wider than the screen width."
@@ -1705,11 +2013,13 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:94
 msgid "Set the space between words in pts. Default is %default"
-msgstr "Sæt afstanden mellem ord i punkter. standardværdien er %default"
+msgstr ""
+"Sæt afstanden mellem ord i pkt (typografiske punkter). standardværdien er "
+"%default"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:97
 msgid "Add a header to all the pages with title and author."
-msgstr "Tilføj sidehoved til alle sider med titel og forfatter"
+msgstr "Tilføj sidehoved til alle sider - med titel og forfatter."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:100
 msgid ""
@@ -1722,22 +2032,21 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:104
 msgid "Add extra spacing below the header. Default is %default pt."
 msgstr ""
-"Tilføj ekstra mellemrum under sidehovedet. Aktuelt er %default standard."
+"Tilføj ekstra afstand under sidehovedet. Standardværdien er %default pkt."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:107
 msgid ""
 "Minimum paragraph indent (the indent of the first line of a paragraph) in "
 "pts. Default: %default"
 msgstr ""
-"Minimum afsnitsindrykning(indrykning af første linje i et afsnit) i punkter. "
-"Standardværd: %default"
+"Minimum indrykning af første linje i et afsnit i pkt. Standardværdi: %default"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:112
 msgid ""
 "Render tables in the HTML as images (useful if the document has large or "
 "complex tables)"
 msgstr ""
-"Vis HTML-tabeller som billeder(brugbar hvis dokumentet har store eller "
+"Vis HTML-tabeller som billeder (brugbar hvis dokumentet har store eller "
 "komplekse tabeller)"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:117
@@ -1750,110 +2059,118 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:121
 msgid "The serif family of fonts to embed"
-msgstr "Serif font-familien, der skal indfældes"
+msgstr "Serif skriftsfamilien, der skal indlejres"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:124
 msgid "The sans-serif family of fonts to embed"
-msgstr "Sans-serif font-familien, der skal indfældes"
+msgstr "Sans-serif skriftsfamilien, der skal indlejres"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:127
 msgid "The monospace family of fonts to embed"
-msgstr "Monospace font-familien, der skal indfældes"
+msgstr "Monospace skriftsfamilien, der skal indlejres"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:152
 msgid "Comic"
-msgstr ""
+msgstr "Tegneserie"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:363
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:389
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:98
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:174
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:416
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:359
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:887
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:543
 msgid "Title"
-msgstr ""
+msgstr "Titel"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:364
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:62
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:175
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:421
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1160
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:888
 msgid "Author(s)"
-msgstr ""
+msgstr "Forfatter(e)"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:365
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:64
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:180
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72
 msgid "Publisher"
 msgstr "Forlag"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:366
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:392
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49
 msgid "Producer"
-msgstr ""
+msgstr "Producer"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:367
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:184
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:35
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:210
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:211
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:185
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:95
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:318
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1079
 msgid "Comments"
-msgstr ""
+msgstr "Kommentarer"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:375
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:181
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1104
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1163
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:97
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:151
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:401
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:27
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1075
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:139
 msgid "Tags"
-msgstr ""
+msgstr "Mærker"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:182
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:96
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:151
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:26
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1084
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:87
 msgid "Series"
-msgstr ""
+msgstr "Serier"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:378
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:404
 msgid "Language"
-msgstr ""
+msgstr "Sprog"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:380
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1103
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:406
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1067
 msgid "Timestamp"
-msgstr ""
+msgstr "Tidsstempel"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:66
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:178
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70
 msgid "Published"
-msgstr ""
+msgstr "Udgivet"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:384
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:410
 msgid "Rights"
-msgstr ""
+msgstr "Rettigheder"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/amazon.py:85
 msgid "EDITORIAL REVIEW"
-msgstr ""
+msgstr "LEDER REVISION"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:41
 msgid ""
 "Extract common e-book formats from archives (zip/rar) files. Also try to "
 "autodetect if they are actually cbz/cbr files."
 msgstr ""
+"Ekstrahér almindelige e-bogsformater fra arkiver (zip/rar)-filer. Prøv også "
+"at auto-detektere om de er cbz/cbr-filer."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:20
 msgid "options"
-msgstr ""
+msgstr "indstillinger"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:21
 msgid ""
@@ -1868,46 +2185,64 @@ msgid ""
 "some metadata on a file type that does not support it, the metadata will be\n"
 "silently ignored.\n"
 msgstr ""
+"\n"
+"Hent/gem metadata fra/til e-bogsfiler.\n"
+"\n"
+"Understøttede formater ved hentning af metadata: %s\n"
+"\n"
+"Understøttede formater ved gemning af metadata: %s\n"
+"\n"
+"Forskellige filtyper understøttende forskellige slags metadata. Hvis du "
+"prøver at vælger\n"
+"nogle metadata i en filtype som ikke understøtter den, vil metadataene blive "
+"ignoreret.\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:40
 msgid ""
 "Set the authors. Multiple authors should be separated by the & character. "
 "Author names should be in the order Firstname Lastname."
 msgstr ""
+"Angiv forfatterne. Flere forfattere skal separeres af &-tegnet. "
+"Forfatternavne skal skrives som Fornavn Efternavn."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:44
 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 ""
+"Titelversionen anvendes ved titelsortering. Hvis ikke angivet og titlen er "
+"angivet, vil denne blive auto-genereret fra titlen."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:48
 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 ""
+"Forfatterversion som anvendes ved forfattersortering. Hvis ikke angivet og "
+"forfatter(ne) er angivet, vil denne blive auto-genereret fra forfatter(ne)."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:52
 msgid "Set the cover to the specified file."
-msgstr ""
+msgstr "Angiv omslag til den aktuelle fil."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:58
 msgid "Set the book category."
-msgstr ""
+msgstr "Angiv bogkategori."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:74
 msgid "Set the published date."
-msgstr ""
+msgstr "Angiv udgivelsesdato."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:77
 msgid "Get the cover from the ebook and save it at as the specified file."
-msgstr ""
+msgstr "Hent omslaget fra e-bogen og gem den som den angivne fil."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:80
 msgid ""
 "Specify the name of an OPF file. The metadata will be written to the OPF "
 "file."
 msgstr ""
+"Angiv navnet til en OPF-fil. Metadataene vil blive skrevet til OPF-filen."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:83
 msgid ""
@@ -1915,74 +2250,91 @@ msgid ""
 "ebook. Metadata specified on the command line will override metadata read "
 "from the OPF file"
 msgstr ""
+"Hent metadata fra den angivne OPF-fil og anvend den som bogens metadata. "
+"Metadataene angivet på kommandolinjen vil tilsidesætte metadata læst fra OPF-"
+"filen"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:88
 msgid "Set the BookID in LRF files"
-msgstr ""
+msgstr "Valgt BookID i LRF-filer"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:153
 msgid "No file specified"
-msgstr ""
+msgstr "Ingen fil angivet"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:168
 msgid "Original metadata"
-msgstr ""
+msgstr "Oprindelige metadata"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:185
 msgid "Changed metadata"
-msgstr ""
+msgstr "Ændrede metadata"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:197
 msgid "OPF created in"
-msgstr ""
+msgstr "OPF oprettet i"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:203
 msgid "Cover saved to"
-msgstr ""
+msgstr "Omslag gemt til"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:205
 msgid "No cover found"
-msgstr ""
+msgstr "Intet omslag fundet"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/covers.py:15
+msgid "Cover download"
+msgstr "Download omslag"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/douban.py:42
+msgid "Downloads metadata from Douban.com"
+msgstr "Download metadata fra Douban.com"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:34
 msgid "Metadata download"
-msgstr ""
+msgstr "Download metadata"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:111
 msgid "ratings"
-msgstr ""
+msgstr "vurderinger"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:111
 msgid "tags"
-msgstr "mærkater"
+msgstr "mærker"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:112
 msgid "description/reviews"
-msgstr ""
+msgstr "beskrivelser/anmeldelser"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:113
 msgid "Download %s from %s"
-msgstr ""
+msgstr "Download %s fra %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:137
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:139
 msgid "Downloads metadata from Google Books"
-msgstr ""
+msgstr "Downloads metadata fra Google Books"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:153
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:156
 msgid "Downloads metadata from isbndb.com"
-msgstr ""
+msgstr "Downloads metadata fra isbndb.com"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:181
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:184
 msgid ""
 "To use isbndb.com you must sign up for a %sfree account%s and enter your "
 "access key below."
 msgstr ""
+"For at anvende isbndb.com må du oprette en konto %sfree account%s og angive "
+"din adgangskode herunder."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:189
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:194
 msgid "Downloads social metadata from amazon.com"
-msgstr ""
+msgstr "Downloader sociale metadata fra amazon.com"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:94
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:213
+msgid "Downloads series/tags/rating information from librarything.com"
+msgstr "Downloader serie/mærke/vurdering information fra librarything.com"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:95
 msgid ""
 "\n"
 "%prog [options] key\n"
@@ -1995,168 +2347,191 @@ msgid ""
 "isbndb.com.\n"
 "\n"
 msgstr ""
+"\n"
+"%prog [options] nøgle\n"
+"\n"
+"Hent metadata til bøger fra isndb.com. Du kan enten angive bogens ISBN ID "
+"eller dens titel og forfatter. Hvis du angiver titel og forfatter,\n"
+"så kan mere end en bogs oplysninger bliver more modtaget.\n"
+"\n"
+"key is the account key you generate after signing up for a free account from "
+"isbndb.com.\n"
+"\n"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:105
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:106
 msgid "The ISBN ID of the book you want metadata for."
-msgstr ""
+msgstr "Bogens ISBN ID som du ønsker metadata om."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:107
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:108
 msgid "The author whose book to search for."
-msgstr ""
+msgstr "Forfatteren hvis bøger der søges efter."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:109
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:110
 msgid "The title of the book to search for."
-msgstr ""
+msgstr "Bogens titel der søges efter"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:111
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:112
 msgid "The publisher of the book to search for."
-msgstr ""
+msgstr "Bogens forlag der søges efter."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:53
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:68
 msgid "LibraryThing.com timed out. Try again later."
-msgstr ""
+msgstr "LibraryThing.com timeout. Prøv igen senere."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:60
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:75
 msgid ""
 "Could not fetch cover as server is experiencing high load. Please try again "
 "later."
 msgstr ""
+"Kunne ikke hente omslag, da serveren udsættes for stor belastning. Prøv igen "
+"senere."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:61
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:76
 msgid " not found."
-msgstr ""
+msgstr " ikke fundet."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:64
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:79
 msgid "LibraryThing.com server error. Try again later."
-msgstr ""
+msgstr "LibraryThing.com serverfejl. Prøv igen senere."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:71
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:86
 msgid ""
 "\n"
 "%prog [options] ISBN\n"
 "\n"
-"Fetch a cover image for the book identified by ISBN from LibraryThing.com\n"
+"Fetch a cover image/social metadata for the book identified by ISBN from "
+"LibraryThing.com\n"
 msgstr ""
+"\n"
+"%prog [options] ISBN\n"
+"\n"
+"Hent et omslagsbillede/sociale metadata til denne bog identificeret ved ISBN "
+"fra LibraryThing.com\n"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1103
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1372
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1226
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1399
 msgid "Cover"
-msgstr ""
+msgstr "Omslag"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:22
 msgid "Modify images to meet Palm device size limitations."
 msgstr ""
+"Modificér billeder til at opfylde Palm-enhedens størrelsebegrænsninger."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:26
 msgid "When present, use author sort field as author."
 msgstr ""
-"Forfattersortering bruges til at sætte forfatterfeltet, når det er tilstede"
+"Forfattersortering bruges til at sætte forfatterfeltet, når det er tilstede."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:30
 msgid ""
 "Don't add Table of Contents to end of book. Useful if the book has its own "
 "table of contents."
 msgstr ""
+"Indsæt ikke indholdsfortegnelsen til slutningen af bogen. Anvendeligt hvis "
+"bogen har sin egen indholdsfortegnelse."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:33
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:56
 msgid "Title for any generated in-line table of contents."
-msgstr ""
+msgstr "Titel for enhver genereret in-line indholdsfortegnelse."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:37
 msgid "Disable compression of the file contents."
-msgstr ""
+msgstr "Deaktivér kompression af filindholdet."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:40
 msgid "Tag marking book to be filed with Personal Docs"
-msgstr ""
+msgstr "Mærk bogen til at blive gemt med Personal Docs"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:108
 msgid "All articles"
-msgstr ""
+msgstr "Alle artikler"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:258
 msgid "This is an Amazon Topaz book. It cannot be processed."
 msgstr ""
+"E-bogen er i det proprietære Amazon Topaz format. Den kan derfor ikke "
+"behandles."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1373
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1400
 msgid "Title Page"
-msgstr ""
+msgstr "Titelside"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1374
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1401
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:15
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:53
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:194
 msgid "Table of Contents"
-msgstr ""
+msgstr "Indholdsfortegnelse"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1375
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1402
 msgid "Index"
-msgstr ""
+msgstr "Indeks"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1376
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1403
 msgid "Glossary"
-msgstr ""
+msgstr "Ordliste"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1377
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1404
 msgid "Acknowledgements"
-msgstr ""
+msgstr "Anerkendelser"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1378
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1405
 msgid "Bibliography"
-msgstr ""
+msgstr "Litteraturliste"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1379
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1406
 msgid "Colophon"
-msgstr ""
+msgstr "Kolofon"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1380
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1407
 msgid "Copyright"
-msgstr ""
+msgstr "Ophavsret"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1381
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1408
 msgid "Dedication"
-msgstr ""
+msgstr "Dedikation"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1382
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1409
 msgid "Epigraph"
-msgstr ""
+msgstr "Epigraf"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1383
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1410
 msgid "Foreword"
-msgstr ""
+msgstr "Forord"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1384
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1411
 msgid "List of Illustrations"
-msgstr ""
+msgstr "Illustrationsliste"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1385
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1412
 msgid "List of Tables"
-msgstr ""
+msgstr "Tabelliste"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1386
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1413
 msgid "Notes"
-msgstr ""
+msgstr "Bemærkninger"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1387
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1414
 msgid "Preface"
-msgstr ""
+msgstr "Forord"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1388
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1415
 msgid "Main Text"
-msgstr ""
+msgstr "Hovedtekst"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/iterator.py:39
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/iterator.py:41
 msgid "%s format books are not supported"
 msgstr "Bøger af %s formatet er ikke understøttet"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:54
 msgid "HTML TOC generation options."
-msgstr ""
+msgstr "HTML indholdsfortegnelse genereringsmuligheder."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:113
 msgid "Book Jacket"
-msgstr ""
+msgstr "Boglomme"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/split.py:34
 msgid ""
@@ -2164,62 +2539,70 @@ msgid ""
 msgstr ""
 "Kunne ikke finde et passende sted at dele: %s Størrelse på undertræ: %d KB"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:68
-msgid "Unnamed"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/writer.py:32
 msgid "OPF/NCX/etc. generation options."
-msgstr ""
+msgstr "OPF/NCX/osv. genereringsmuligheder."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/writer.py:35
 msgid "OPF version to generate. Default is %default."
-msgstr ""
+msgstr "OPF versionsgenerering. Standard er %default."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/writer.py:37
 msgid ""
 "Generate an Adobe \"page-map\" file if pagination information is available."
 msgstr ""
+"Gener´r en Adobe \"page-map\" fil hvis sidenummereringsinformation er "
+"tilgængelig."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/ereader/reader132.py:128
 msgid "Footnotes"
-msgstr ""
+msgstr "Fodnoter"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/ereader/reader132.py:135
 msgid "Sidebar"
-msgstr ""
+msgstr "Sidepanel"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:22
 #: /home/kovid/work/calibre/src/calibre/ebooks/tcr/input.py:23
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:22
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:24
 msgid ""
 "Normally calibre treats blank lines as paragraph markers. With this option "
 "it will assume that every line represents a paragraph instead."
 msgstr ""
+"Normalt fortolker calibre blanke linjer (=2 linjeskift) som "
+"afsnitsmarkering. Med denne valgmulighed vil calibre fortolke ét linjeskift "
+"som afsnitsmarkering."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:26
 #: /home/kovid/work/calibre/src/calibre/ebooks/tcr/input.py:27
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:26
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:28
 msgid ""
 "Normally calibre treats blank lines as paragraph markers. With this option "
 "it will assume that every line starting with an indent (either a tab or 2+ "
 "spaces) represents a paragraph. Paragraphs end when the next line that "
 "starts with an indent is reached."
 msgstr ""
+"Normalt fortolker calibre blanke linjer (=2 linjeskift) som "
+"afsnitsmarkering. Med denne valgmulighed vil calibre fortolke enhver linje "
+"med indrykning (enten et tabulatortegn eller 2+ mellemrum) som "
+"afsnitsmarkering. Afsnit slutter når et linjeskift efterfølges af en "
+"indrykning."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/output.py:23
 msgid "Format to use inside the pdb container. Choices are:"
-msgstr ""
+msgstr "Format som anvendes indeni pdb-containeren. Valgmulighederne er:"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/output.py:27
 msgid ""
 "Specify the character encoding of the output document. The default is "
 "cp1252. Note: This option is not honored by all formats."
 msgstr ""
+"Angiv output-dokumentets tegnsæt. Standard er cp1252. Bemærk: Denne "
+"valgmulighed honoreres ikke af alle formater."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/input.py:24
 msgid "Do not extract images from the document"
-msgstr ""
+msgstr "Ekstraher ikke billeder ud af  dokumentet"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/input.py:26
 msgid ""
@@ -2227,10 +2610,13 @@ msgid ""
 "Valid values are a decimal between 0 and 1. The default is 0.5, this is the "
 "median line length."
 msgstr ""
+"Skala anvendt til at fastslå længden ved hvilken en linje skal af-ombrydes. "
+"Valide værdier er et decimattal i intervallet 0 til 1. Standardværdi er 0.5, "
+"Dette er median linjelængden."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/input.py:30
 msgid "Use the new PDF conversion engine."
-msgstr ""
+msgstr "Anvend den nye PDF konverteringsmotor."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/cli.py:31
 msgid ""
@@ -2243,6 +2629,15 @@ msgid ""
 "\n"
 "Manipulate a PDF.\n"
 msgstr ""
+"kommando...\n"
+"\n"
+"kommando kan være en af følgende:\n"
+"[%%commands]\n"
+"\n"
+"Anvend %prog kommando --help for at få mere information om en specifik "
+"kommando\n"
+"\n"
+"Manipulér en PDF.\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:29
 msgid ""
@@ -2250,6 +2645,9 @@ msgid ""
 "\n"
 "Crop a PDF file.\n"
 msgstr ""
+"[options] fil.pdf\n"
+"\n"
+"Tilskær en PDF-fil.\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:38
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/decrypt.py:32
@@ -2261,33 +2659,35 @@ msgstr ""
 msgid ""
 "Path to output file. By default a file is created in the current directory."
 msgstr ""
-"Sti til output-filen. Som standard oprettes en fil i den nuværende mappe."
+"Sti til output-filen. Som standard oprettes en fil i den aktuelle mappe."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:41
 msgid "Number of pixels to crop from the left most x (default is %s)"
-msgstr ""
+msgstr "Antal af pixels der skal afskæres fra venstre x (standard er %s)"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:44
 msgid "Number of pixels to crop from the left most y (default is %s)"
-msgstr ""
+msgstr "Antal af pixels der skal afskæres fra venstre y (standard er %s)"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:47
 msgid "Number of pixels to crop from the right most x (default is %s)"
-msgstr ""
+msgstr "Antal af pixels der skal afskæres fra højre x (standard er %s)"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:50
 msgid "Number of pixels to crop from the right most y (default is %s)"
-msgstr ""
+msgstr "Antal af pixels der skal afskæres fra højre y (standard er %s)"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:53
 msgid ""
 "A file generated by ghostscript which allows each page to be individually "
 "cropped `gs -dSAFER -dNOPAUSE -dBATCH -sDEVICE=bbox file.pdf 2> bounding`"
 msgstr ""
+"En fil genereret af ghostscript som tillader individuel afskæring `gs -"
+"dSAFER -dNOPAUSE -dBATCH -sDEVICE=bbox file.pdf 2> bounding`"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:73
 msgid "Crop Options:"
-msgstr ""
+msgstr "Afskæringsmuligheder:"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:73
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/decrypt.py:60
@@ -2297,7 +2697,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/rotate.py:53
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/split.py:61
 msgid "Options to control the transformation of pdf"
-msgstr ""
+msgstr "Valgmuligheder til at styre pdf-transformationen"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/decrypt.py:23
 msgid ""
@@ -2305,10 +2705,13 @@ msgid ""
 "\n"
 "Decrypt a PDF.\n"
 msgstr ""
+"[options] fil.pdf kodeord\n"
+"\n"
+"Afkrypter en PDF.\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/decrypt.py:60
 msgid "Decrypt Options:"
-msgstr ""
+msgstr "Afkrypteringsmuligheder:"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/encrypt.py:25
 msgid ""
@@ -2316,10 +2719,13 @@ msgid ""
 "\n"
 "Encrypt a PDF.\n"
 msgstr ""
+"[options] fil.pdf kodeord\n"
+"\n"
+"Kryptér en PDF.\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/encrypt.py:54
 msgid "Encrypt Options:"
-msgstr ""
+msgstr "Krypteringsmuligheder:"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:21
 msgid ""
@@ -2327,30 +2733,35 @@ msgid ""
 "\n"
 "Get info about a PDF.\n"
 msgstr ""
+"fil.pdf ...\n"
+"\n"
+"Hent information om en PDF.\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
 msgid "Author"
-msgstr ""
+msgstr "Forfatter"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47
 msgid "Subject"
-msgstr ""
+msgstr "Emne"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:48
 msgid "Creator"
-msgstr ""
+msgstr "Ophavsmand"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:50
 msgid "Pages"
-msgstr ""
+msgstr "Sider"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:51
 msgid "File Size"
-msgstr ""
+msgstr "Filstørrelse"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:52
 msgid "PDF Version"
-msgstr ""
+msgstr "PDF version"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/merge.py:25
 msgid ""
@@ -2360,10 +2771,15 @@ msgid ""
 "\n"
 "Merges individual PDFs.\n"
 msgstr ""
+"[options] fil1.pdf fil2.pdf ...\n"
+"\n"
+"Metadata vil blive hentet fra den først angivne PDF.\n"
+"\n"
+"Fletter individuelle PDFs.\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/merge.py:56
 msgid "Merge Options:"
-msgstr ""
+msgstr "Flettemuligheder:"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/reverse.py:25
 msgid ""
@@ -2371,10 +2787,13 @@ msgid ""
 "\n"
 "Reverse a PDF.\n"
 msgstr ""
+"[options] fil.pdf\n"
+"\n"
+"Vend en PDF.\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/reverse.py:54
 msgid "Reverse Options:"
-msgstr ""
+msgstr "Vendemuligheder:"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/rotate.py:24
 msgid ""
@@ -2382,10 +2801,13 @@ msgid ""
 "\n"
 "Rotate pages of a PDF clockwise.\n"
 msgstr ""
+"fil.pdf grader\n"
+"\n"
+"Rotér PDF-sider med uret.\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/rotate.py:53
 msgid "Rotate Options:"
-msgstr ""
+msgstr "Roteringsmuligheder:"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/split.py:25
 msgid ""
@@ -2401,41 +2823,67 @@ msgid ""
 "\n"
 "Split a PDF.\n"
 msgstr ""
+"\n"
+"%prog %%name [options] fil.pdf page_to_split_on ...\n"
+"%prog %%name [options] fil.pdf page_range_to_split_on ...\n"
+"\t\n"
+"F.eks.\n"
+"\t\n"
+"%prog %%name fil.pdf 6\n"
+"%prog %%name fil.pdf 6-12\n"
+"%prog %%name fil.pdf 6-12 8 10 9-20\n"
+"\n"
+"Del en PDF.\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/split.py:61
 msgid "Split Options:"
-msgstr ""
+msgstr "Delemuligheder:"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/output.py:59
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/output.py:31
 msgid ""
 "The unit of measure. Default is inch. Choices are %s Note: This does not "
 "override the unit for margins!"
 msgstr ""
+"Længdemålenhed. Standard er US tomme. Valgmuligheder er %s Bemærk: Dette "
+"tilsidesætter margenenheden!"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/output.py:64
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/output.py:36
 msgid ""
 "The size of the paper. This size will be overridden when an output profile "
 "is used. Default is letter. Choices are %s"
 msgstr ""
+"Papirsstørrelse. Størrelsen vil blive tilsidesat når en output-profil "
+"anvendes. Stanard er letter. Valgmulighederne er %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/output.py:68
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/output.py:40
 msgid ""
 "Custom size of the document. Use the form widthxheight EG. `123x321` to "
 "specify the width and height. This overrides any specified paper-size."
 msgstr ""
+"Tilpasset papirsstørrelse. Anvend formen breddexhøjde f.eks. `123x321` for "
+"at angive bredden og højden. Dette tilsidesætter enhver angivet "
+"papirsstørrelse."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/output.py:73
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/output.py:45
 msgid "The orientation of the page. Default is portrait. Choices are %s"
+msgstr "Sideorientering. Standard er portræt. Valgmuligheder er %s"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/output.py:49
+msgid ""
+"Preserve the aspect ratio of the cover, instead of stretching it to fill the "
+"ull first page of the generated pdf."
 msgstr ""
+"Bevar omslagets aspektforhold, istedet for at strække omslaget af den første "
+"side af den genererede pdf."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftohtml.py:55
 msgid "Could not find pdftohtml, check it is in your PATH"
-msgstr ""
+msgstr "Kunne ikke finde pdftohtml, check at den er i din PATH"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pml/output.py:33
 msgid ""
 "Specify the character encoding of the output document. The default is cp1252."
-msgstr ""
+msgstr "Angiv output-dokumentets tegnsæt. Standard er cp1252."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:199
 msgid ""
@@ -2443,11 +2891,14 @@ msgid ""
 "first and then try it.\n"
 "%s"
 msgstr ""
+"Denne RTF-fil har en funktion calibre ikke understøtter. Konvertér den først "
+"til HTML - og dernæst prøv den igen.\n"
+"%s"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/tcr/output.py:23
 msgid ""
 "Specify the character encoding of the output document. The default is utf-8."
-msgstr ""
+msgstr "Angiv output-dokumentets tegnsæt. Standard er utf-8."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/tcr/output.py:27
 msgid ""
@@ -2455,16 +2906,28 @@ msgid ""
 "compression but the fastest and 10 being the highest compression but the "
 "slowest."
 msgstr ""
+"Angiv ønsket kompressionsniveau. Værdiinterval 1 - 10. 1 er den laveste "
+"kompression men hurtigste - og 10 er den højeste kompression men langsomste."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:32
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:34
+msgid ""
+"Normally extra spaces are condensed into a single space. With this option "
+"all spaces will be displayed."
+msgstr ""
+"Normalt bliver to eller flere mellemrum erstattet af et enkelt. Med denne "
+"valgmulighed vil alle mellemrum vises."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:37
 msgid ""
 "Run the text input through the markdown pre-processor. To learn more about "
 "markdown see"
 msgstr ""
+"Kør input-teksten gennem markdown preprocessoren. For at lære mere om "
+"markdown se"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:35
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:40
 msgid "Do not insert a Table of Contents into the output text."
-msgstr ""
+msgstr "Indsæt ikke indholdsfortegnelsen i output-teksten."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/txt/output.py:24
 msgid ""
@@ -2472,12 +2935,17 @@ msgid ""
 "for compatibility with Mac OS 9 and earlier. For Mac OS X use 'unix'. "
 "'system' will default to the newline type used by this OS."
 msgstr ""
+"Linjeskiftsvariant. Mulighederne er %s. Standard er 'system'. Anvend "
+"'old_mac' for kompatibilitet med Mac OS 9 og tidligere. For Mac OS X anvend "
+"'unix'. 'system' will som standard anvende det som OSet anvender."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/txt/output.py:30
 msgid ""
 "Specify the character encoding of the output document. The default is utf-8. "
 "Note: This option is not honored by all formats."
 msgstr ""
+"Angiv output-dokumentets ønskede tegnsæt. Standard er utf-8. Bemærk: "
+"Valgmuligheden honoreres ikke af alle formater."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/txt/output.py:38
 msgid ""
@@ -2486,201 +2954,841 @@ msgid ""
 "the space after and will exceed the specified value. Also, there is a "
 "minimum of 25 characters. Use 0 to disable line splitting."
 msgstr ""
+"Det maksimale antal tegn per linje. Dette deler ved det første mellemrum før "
+"den angivne værdi. Hvis ingen mellemrum findes i den linje der skal deles, "
+"deles ved det efterfølgende mellemrum og værdien vil i så fald overskrides. "
+"Bemærk: Der er en minimumsgrænse på 25 tegn. Anvend 0 for at deaktivere "
+"linjedeling."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/txt/output.py:45
 msgid ""
 "Force splitting on the max-line-length value when no space is present. Also "
 "allows max-line-length to be below the minimum"
 msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:31
-msgid "Send file to storage card instead of main memory by default"
-msgstr ""
+"Håndhæv linjedeling før max-linje-længde værdien, også når ingen mellemrum "
+"findes. Tillad og at max-linje-længden kan være under minimum"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:33
-msgid "Confirm before deleting"
+msgid "Send file to storage card instead of main memory by default"
 msgstr ""
+"Send som standard filen til hukommelseskortet istedet for arbejdshukommelsen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:35
-msgid "Toolbar icon size"
-msgstr ""
+msgid "Confirm before deleting"
+msgstr "Bekræft før sletning"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:37
-msgid "Show button labels in the toolbar"
-msgstr ""
+msgid "Toolbar icon size"
+msgstr "Ikonstørrelse på værktøjslinje"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:39
-msgid "Main window geometry"
-msgstr ""
+msgid "Show button labels in the toolbar"
+msgstr "Vis knappemærker i værktøjslinje"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:41
-msgid "Notify when a new version is available"
-msgstr ""
+msgid "Main window geometry"
+msgstr "Arbejdsvindues geometri"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:43
-msgid "Use Roman numerals for series number"
-msgstr ""
+msgid "Notify when a new version is available"
+msgstr "Advisér når en ny version er tilgængelig"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:45
-msgid "Sort tags list by popularity"
-msgstr ""
+msgid "Use Roman numerals for series number"
+msgstr "Anvend romertal til serienumre"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
-msgid "Number of covers to show in the cover browsing mode"
-msgstr ""
+msgid "Sort tags list by name, popularity, or rating"
+msgstr "Sortér mærkeliste efter navn, popularitet eller vurdering"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:49
-msgid "Defaults for conversion to LRF"
-msgstr ""
+msgid "Number of covers to show in the cover browsing mode"
+msgstr "Antallet af omslag der vises i omslags browser-tilstand"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:51
-msgid "Options for the LRF ebook viewer"
-msgstr ""
+msgid "Defaults for conversion to LRF"
+msgstr "Standardvalg ved konvertering til LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:54
-msgid "Formats that are viewed using the internal viewer"
-msgstr ""
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:53
+msgid "Options for the LRF ebook viewer"
+msgstr "Muligheder for LRF ebook læser"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
-msgid "Columns to be displayed in the book list"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
-msgid "Automatically launch content server on application startup"
-msgstr ""
+msgid "Formats that are viewed using the internal viewer"
+msgstr "Formater som kan ses ved anvendelse af den indbyggede e-bogslæser"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
-msgid "Oldest news kept in database"
-msgstr ""
+msgid "Columns to be displayed in the book list"
+msgstr "Kolonner som vises i boglisten"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:59
-msgid "Show system tray icon"
-msgstr ""
+msgid "Automatically launch content server on application startup"
+msgstr "Start automatisk indholdsserver under applikationsopstart"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:60
+msgid "Oldest news kept in database"
+msgstr "Ældste nyheder gemt i databasen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:61
-msgid "Upload downloaded news to device"
-msgstr ""
+msgid "Show system tray icon"
+msgstr "Vis statusikon"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:63
-msgid "Delete books from library after uploading to device"
-msgstr ""
+msgid "Upload downloaded news to device"
+msgstr "Upload downloadede nyheder til enheden"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:65
+msgid "Delete books from library after uploading to device"
+msgstr "Slet bøger fra bibliotek efter upload til enhed"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:67
 msgid ""
 "Show the cover flow in a separate window instead of in the main calibre "
 "window"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:67
-msgid "Disable notifications from the system tray icon"
-msgstr ""
+msgstr "Vis omslag i et separat vindue istedet for i calibres arbejdsvindue"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:69
-msgid "Default action to perform when send to device button is clicked"
-msgstr ""
+msgid "Disable notifications from the system tray icon"
+msgstr "Deaktivér adviseringer i systemstatusikonet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:91
-msgid "Maximum number of waiting worker processes"
-msgstr ""
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71
+msgid "Default action to perform when send to device button is clicked"
+msgstr "Ønsket standardaktion når enhedsknappens trykkes"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93
-msgid "Download social metadata (tags/rating/etc.)"
-msgstr ""
+msgid "Maximum number of waiting worker processes"
+msgstr "Maksimalt antal ventende arbejdsprocesser"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
-msgid "Overwrite author and title with new metadata"
-msgstr ""
+msgid "Download social metadata (tags/rating/etc.)"
+msgstr "Download sociale metadata (mærker/vurderinger/osv.)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
+msgid "Overwrite author and title with new metadata"
+msgstr "Overskriv forfatter og titel med ny metadata"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99
 msgid "Limit max simultaneous jobs to number of CPUs"
-msgstr ""
+msgstr "Begræns max antal samtidige opgaver til CPU kerneantallet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:475
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101
+msgid "tag browser categories not to display"
+msgstr "Mærk browser kategorier som ikke skal vises"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:103
+msgid "The layout of the user interface"
+msgstr "Brugergrænsefladens layout"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
+msgid "Show the average rating per item indication in the tag browser"
+msgstr "Vis middelvurdering per post indikeret i mærke browseren"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:107
+msgid "Disable UI animations"
+msgstr "Deaktivér brugergrænseflade animationer"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:476
 msgid "Copied"
-msgstr ""
+msgstr "Kopieret"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:189
 msgid "Copy"
-msgstr ""
+msgstr "Kopiér"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:189
 msgid "Copy to Clipboard"
-msgstr ""
+msgstr "Kopiér til udklipsholder"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:400
 msgid "Choose Files"
+msgstr "Vælg filer"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:245
+msgid "Use library only"
+msgstr "Anvend kun bibliotek"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:246
+msgid "User annotations generated from main library only"
+msgstr "Kun brugernoter genereret fra arbejdsbibliotek"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:670
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:707
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:728
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:876
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:941
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1059
+msgid "No books selected"
+msgstr "Ingen bøger valgt"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:76
+msgid "No books selected to fetch annotations from"
+msgstr "Ingen bøger valgt til at hente brugernoter fra"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:101
+msgid "Merging user annotations into database"
+msgstr "Fletter brugernoter ind i database"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:129
+msgid "%s<br />Last Page Read: %d (%d%%)"
+msgstr "%s<br />sidste side læst: %d (%d%%)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:135
+msgid "%s<br />Last Page Read: Location %d (%d%%)"
+msgstr "%s<br />sidste side læst: Placering %d (%d%%)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:154
+msgid "<b>Location %d &bull; %s</b><br />%s<br />"
+msgstr "<b>Placering %d &bull; %s</b><br />%s<br />"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:163
+msgid "<b>Page %d &bull; %s</b><br />"
+msgstr "<b>Side %d &bull; %s</b><br />"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:168
+msgid "<b>Location %d &bull; %s</b><br />"
+msgstr "<b>Placering %d &bull; %s</b><br />"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:291
+msgid "How many empty books?"
+msgstr "Hvor mange tomme bøger?"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:292
+msgid "How many empty books should be added?"
+msgstr "Hvor mange tomme bøger skal tilføjes?"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:390
+msgid "Uploading books to device."
+msgstr "Sender bøger til enheden."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:350
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:137
+msgid "Books"
+msgstr "Bøger"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
+msgid "EPUB Books"
+msgstr "EPUB-bøger"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
+msgid "LRF Books"
+msgstr "LRF-bøger"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
+msgid "HTML Books"
+msgstr "HTML-bøger"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
+msgid "LIT Books"
+msgstr "LIT-bøger"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
+msgid "MOBI Books"
+msgstr "MOBI-bøger"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
+msgid "Topaz books"
+msgstr "Topaz-bøger"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
+msgid "Text books"
+msgstr "Tekst-bøger"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
+msgid "PDF Books"
+msgstr "PDF-bøger"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:359
+msgid "Comics"
+msgstr "Tegneserier"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:360
+msgid "Archives"
+msgstr "Arkiver"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:364
+msgid "Supported books"
+msgstr "Understøttede bøger"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:399
+msgid "Merged some books"
+msgstr "Flettede nogle bøger"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:400
+msgid ""
+"Some duplicates were found and merged into the following existing books:"
 msgstr ""
+"Nogle dubletter blev fundet og flettet ind i følgende eksisterende bøger:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:409
+msgid "Failed to read metadata"
+msgstr "Kunne ikke læse metadata"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:410
+msgid "Failed to read metadata from the following"
+msgstr "Kunne ikke læse metadata fra følgende"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:434
+msgid "Add to library"
+msgstr "Tilføj til bibliotek"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:459
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1228
+msgid "No book selected"
+msgstr "Ingen bog valgt"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:434
+msgid "No book files found"
+msgstr "Ingen bogfiler fundet"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:456
+msgid "Cannot delete"
+msgstr "Kan ikke slette"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:469
+msgid "Choose formats to be deleted"
+msgstr "Vælg formater der skal slettes"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:487
+msgid "Choose formats <b>not</b> to be deleted"
+msgstr "Vælg formater der <b>ikke</b> skal slettes"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:507
+msgid "Cannot delete books"
+msgstr "Kan ikke slette bøger"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:508
+msgid "No device is connected"
+msgstr "Ingen enhed forbundet"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:518
+msgid "Main memory"
+msgstr "Arbejdshukommelse"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:519
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:454
+msgid "Storage Card A"
+msgstr "Hukommelsekort A"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:447
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:456
+msgid "Storage Card B"
+msgstr "Hukommelsekort B"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:525
+msgid "No books to delete"
+msgstr "Ingen bøger at slette"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:526
+msgid "None of the selected books are on the device"
+msgstr "Ingen af de valgte bøger findes på enheden"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:600
+msgid "Deleting books from device."
+msgstr "Sletter bøger fra enheden"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:564
+msgid ""
+"The selected books will be <b>permanently deleted</b> and the files removed "
+"from your computer. Are you sure?"
+msgstr ""
+"De valgte bøger vil blive <b>permanent slettet</b> og filerne fjernet fra "
+"din computer. Er du sikker på du vil gøre dette?"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:585
+msgid ""
+"The selected books will be <b>permanently deleted</b> from your device. Are "
+"you sure?"
+msgstr ""
+"De valgte bøger vil blive <b>permanent slettet</b> fra din enhed. Er du "
+"sikker på du vil gøre dette?"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:610
+msgid "Cannot download metadata"
+msgstr "Kan ikke downloade metadata"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
+msgid "social metadata"
+msgstr "Sociale metadata"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
+msgid "covers"
+msgstr "omslag"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
+msgid "metadata"
+msgstr "metadata"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:630
+msgid "Downloading %s for %d book(s)"
+msgstr "Downloader %s til %d bog/bøger"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:654
+msgid "Failed to download some metadata"
+msgstr "Nogle metadata kunne ikke hentes"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
+msgid "Failed to download metadata for the following:"
+msgstr "Metadata for følgende kunne ikke hentes:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:658
+msgid "Failed to download metadata:"
+msgstr "Metadata kunne ikke hentes:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:659
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:638
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:951
+#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
+msgid "Error"
+msgstr "Fejl"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:669
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:706
+msgid "Cannot edit metadata"
+msgstr "Kan ikke redigere metadata"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:727
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:730
+msgid "Cannot merge books"
+msgstr "Kan ikke flette bøger"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:731
+msgid "At least two books must be selected for merging"
+msgstr "Mindst to bøger skal vælges for at kunne flette"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:735
+msgid ""
+"All book formats and metadata from the selected books will be added to the "
+"<b>first selected book.</b><br><br> The second and subsequently selected "
+"books will not be deleted or changed.<br><br>Please confirm you want to "
+"proceed."
+msgstr ""
+"Alle bogformater og metadata fra de valgte bøger vil blive tilføjet til den "
+"<b>først valgte bog.</b><br><br> Den anden og efterfølgende valgte bøger vil "
+"ikke blive slettet eller ændret.<br><br>Venligst bekræft at du ønsker at "
+"fortsætte."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:746
+msgid ""
+"All book formats and metadata from the selected books will be merged into "
+"the <b>first selected book</b>.<br><br>After merger the second and "
+"subsequently selected books will be <b>deleted</b>. <br><br>All book formats "
+"of the first selected book will be kept and any duplicate formats in the "
+"second and subsequently selected books will be permanently <b>deleted</b> "
+"from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
+msgstr ""
+"Alle bogformater og metadata fra de valgte bøger vil blive flettet ind i den "
+"<b>først valgte bog</b>.<br><br>Efter fletning vil den anden og "
+"efterfølgende valgte bøger blive <b>slettet</b>. <br><br>Alle bogformater "
+"fra den først valgte bog vil blive beholdt og alle dubletformater i den "
+"anden og efterfølgende valgte bøger vil blive permanent <b>slettet</b> fra "
+"din computer.<br><br> Er du <b>sikker</b> på at du ønsker at fortsætte?"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:758
+msgid ""
+"You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
+"proceed?"
+msgstr ""
+"Du er igang med at flette mere 5 bøger. Er du <b>sikker</b> på at du ønsker "
+"at fortsætte?"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:875
+msgid "Cannot save to disk"
+msgstr "Kan ikke gemme til disk"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:878
+msgid "Choose destination directory"
+msgstr "Vælg destinationsmappe"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:911
+msgid "Error while saving"
+msgstr "Forsøg på at gemme fejlede"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:912
+msgid "There was an error while saving."
+msgstr "En fejl indtraf ved forsøg på at gemme"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:919
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:920
+msgid "Could not save some books"
+msgstr "Kunne ikke gemme visse bøger"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:921
+msgid "Click the show details button to see which ones."
+msgstr "Klik vis-detalje knappen for at se hvilke."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
+msgid "No books selected to generate catalog for"
+msgstr "Ingen bøger valgt til at generere katalog af"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:959
+msgid "Generating %s catalog..."
+msgstr "Genererer %s katalog..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:964
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:264
+msgid "No books found"
+msgstr "Ingen bøger fundet"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:965
+msgid ""
+"No books to catalog\n"
+"Check exclude tags"
+msgstr ""
+"Ingen bøger til katalogisering\n"
+"Check ekskluderingsmærker"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:975
+msgid "Catalog generated."
+msgstr "Katalog genereret."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:978
+msgid "Export Catalog Directory"
+msgstr "Eksport katalog mappe"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:979
+msgid "Select destination for %s.%s"
+msgstr "Gem destination for %s.%s"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:995
+msgid "Fetching news from "
+msgstr "Henter nyheder fra "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1009
+msgid " fetched."
+msgstr " hentet."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1058
+msgid "Cannot convert"
+msgstr "Kan ikke konvertere"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1087
+msgid "Starting conversion of %d book(s)"
+msgstr "Starter konvertering af %d bog/bøger"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1264
+msgid "Cannot view"
+msgstr "Kan ikke vise"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1209
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
+msgid "Choose the format to view"
+msgstr "Vælg format at vise"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1217
+msgid "Multiple Books Selected"
+msgstr "Flere bøger valgt"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1218
+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 ""
+"Du forsøger at åbne %d bøger. At åbne for mange bøger på en gang kan tage "
+"tid og har en negativ effekt på din computers hastighed. Når processen er "
+"startet, kan den ikke stoppes. Ønsker du at fortsætte?"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1227
+msgid "Cannot open folder"
+msgstr "Kan ikke åbne mappe"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1265
+msgid "%s has no available formats."
+msgstr "%s har ingen tilgængelige formater."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:54
 msgid "Searching in"
-msgstr ""
+msgstr "Søger i"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:232
 msgid "Adding..."
-msgstr ""
+msgstr "Tilføjer..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:245
 msgid "Searching in all sub-directories..."
-msgstr ""
+msgstr "Søger i alle underkataloger..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:251
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:258
 msgid "Path error"
-msgstr ""
+msgstr "Sti fejl"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:259
 msgid "The specified directory could not be processed."
-msgstr ""
+msgstr "Den angivne mappe kunne ikke behandles."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:256
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:517
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
-msgstr ""
+msgstr "Ingen bøger"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:257
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1822
-msgid "No books found"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:330
 msgid "Added"
-msgstr ""
+msgstr "Tilføjet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:343
 msgid "Adding failed"
-msgstr ""
+msgstr "Tilføjning fejlede"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:337
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:344
 msgid ""
 "The add books process seems to have hung. Try restarting calibre and adding "
 "the books in smaller increments, until you find the problem book."
 msgstr ""
+"Tilføj bøger processen synes at hænge. Prøv at genstarte calibre og tilføj "
+"bøgerne i mindre bundter indtil du har fundet en problembog."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:349
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:356
 msgid "Duplicates found!"
-msgstr ""
+msgstr "Dubletter fundet!"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:350
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:357
 msgid ""
 "Books with the same title as the following already exist in the database. "
 "Add them anyway?"
 msgstr ""
+"Bøger med den samme titel som den følgende eksisterer allerede i databasen. "
+"Tilføj dem alligevel?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:360
 msgid "Adding duplicates..."
-msgstr ""
+msgstr "Tilføjer dubletter..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:427
 msgid "Saving..."
-msgstr ""
+msgstr "Gemmer..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:472
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:480
 msgid "Saved"
+msgstr "Gemt"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:57
+msgid "Searching for sub-folders"
+msgstr "Søger efter undermapper"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:62
+msgid "Searching for books"
+msgstr "Søger efter bøger"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:74
+msgid "Looking for duplicates based on file hash"
+msgstr "Ser efter dubletter baseret på fil-hash"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:65
+msgid "Choose root folder"
+msgstr "Vælg rodmappe"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:137
+msgid "Invalid root folder"
+msgstr "Ugyldig rodmappe"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:138
+msgid "is not a valid root folder"
+msgstr "er ikke en gyldig rodmappe"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:148
+msgid "Add books to calibre"
+msgstr "Tilføj bøger til calibre"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/scan_ui.py:21
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/finish_ui.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/kindle_ui.py:41
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/library_ui.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:41
+msgid "WizardPage"
+msgstr "Guide side"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/scan_ui.py:22
+msgid "Scanning root folder for books"
+msgstr "Skanner rodmappe for bøger"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/scan_ui.py:23
+msgid "This may take a few minutes"
+msgstr "Dette kan tage nogle minutter"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:58
+msgid "Choose the location to add books from"
+msgstr "Vælg placeringen at vælge bøger fra"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:59
+msgid "Select a folder on your hard disk"
+msgstr "Vælg en mappe på din harddisk"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:60
+msgid ""
+"<p>calibre can scan your computer for existing books automatically. These "
+"books will then be <b>copied</b> into the calibre library. This wizard will "
+"help you customize the scanning and import process for your existing book "
+"collection.</p>\n"
+"<p>Choose a root folder. Books will be searched for only inside this folder "
+"and any sub-folders.</p>\n"
+"<p>Make sure that the folder you chose for your calibre library <b>is "
+"not</b> under the root folder you choose.</p>"
 msgstr ""
+"<p>calibre kan skanne din computer for eksiterende bøger automatisk. Disse "
+"bøger vil så blive <b>kopieret</b> ind i calibre biblioteket. Denne guide "
+"vil hjælpe dig med at  tilpasse skanningen og importprocessen fra din "
+"eksisterende bogsamling.</p>\n"
+"<p>Vælg en rodmappe. Bøger vil kun blive søgt efter indenfor denne mappe og "
+"eventuelle undermapper.</p>\n"
+"<p>Vær sikker på at mappen du vælger som dit calibre bibliotek <b>ikke "
+"er</b> under rodmappen du valgte.</p>"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:63
+msgid "&Root folder:"
+msgstr "&Root mappe:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:64
+msgid ""
+"This folder and its sub-folders will be scanned for books to import into "
+"calibre's library"
+msgstr ""
+"Denne mappe og dens undermapper vil blive skannet for bøger for at blive "
+"importeret ind i calibres bibliotek"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:637
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:90
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:166
+#: /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/tag_list_editor_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:186
+msgid "..."
+msgstr "..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:67
+msgid "Handle multiple files per book"
+msgstr "Håndér flere filer per bog"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:68
+msgid ""
+"&One book per folder, assumes every ebook file in a folder is the same book "
+"in a different format"
+msgstr ""
+"&One bog per mappe, formoder enhver e-bog fil i en mappe is den samme bog i "
+"forskellige formater"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:69
+msgid ""
+"&Multiple books per folder, assumes every ebook file is a different book"
+msgstr ""
+"&Multiple bøger per mappe, formoder enhver e-bog fil er en distinkt bog"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:23
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:313
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1065
+msgid "Path"
+msgstr "Søgesti"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:24
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:220
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:312
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:96
+msgid "Formats"
+msgstr "Formater"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:25
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:891
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1068
+msgid "Collections"
+msgstr "Samlinger"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:56
+msgid "Click to open"
+msgstr "Klik for at åbne"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:305
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:311
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:317
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1074
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
+#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:274
+msgid "None"
+msgstr "Ingen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:310
+msgid "Click to open Book Details window"
+msgstr "Klik for at åbne bog detalje vindue"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml.py:16
 msgid "CSV/XML Options"
-msgstr ""
+msgstr "CSV/XML valgmuligheder"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml.py:17
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:18
@@ -2698,7 +3806,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input.py:13
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output.py:17
 msgid "Options specific to"
-msgstr ""
+msgstr "Muligheder angivet til"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml.py:17
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:18
@@ -2711,7 +3819,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/rb_output.py:15
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output.py:17
 msgid "output"
-msgstr ""
+msgstr "output"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml_ui.py:37
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:68
@@ -2723,58 +3831,59 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:28
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:119
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:115
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:167
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:66
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:115
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_input_ui.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_output_ui.py:35
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input_ui.py:38
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:42
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/rb_output_ui.py:28
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:62
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:42
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:46
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:49
 #: /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:74
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template_ui.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:35
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:106
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:107
 msgid "Form"
-msgstr ""
+msgstr "Formular"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml_ui.py:38
 msgid "Fields to include in output:"
-msgstr ""
+msgstr "Felter at inkluderer i output:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:17
 msgid "E-book options"
-msgstr ""
+msgstr "E-bogsmuligheder"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:20
-#: /home/kovid/work/calibre/src/calibre/library/catalog.py:282
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:958
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:976
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:222
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1467
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1485
 msgid "Catalog"
-msgstr ""
+msgstr "Katalog"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:69
 msgid "'Don't include this book' tag:"
-msgstr ""
+msgstr "'Inkludér ikke denne bog' mærke:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:70
 msgid "'Mark this book as read' tag:"
-msgstr ""
+msgstr "'Mærk denne bog som læst' mærke:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:71
 msgid "Additional note tag prefix:"
-msgstr ""
+msgstr "Yderligere note mærke præfiks:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:72
 msgid "Regex pattern describing tags to exclude as genres:"
 msgstr ""
+"Regulært udtryks mønster som beskriver mærker som eksluderes som genrer:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:73
 msgid ""
@@ -2784,22 +3893,27 @@ msgid ""
 "- A regex pattern of a single dot excludes all genre tags, generating no "
 "Genre Section"
 msgstr ""
+"Regulært udtryk tips:\n"
+"- Standard regulært udtryk - \\[[\\w ]*\\] - ekskluderer genrer mærker af "
+"formen [tag], f.eks., [Amazon Freebie]\n"
+"- Et regulært udtryksmønster med et enkelt punktum ekskluderer alle genrer "
+"mærker, genereret uden genre sektion"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:76
 msgid "Include 'Titles' Section"
-msgstr ""
+msgstr "Inkludér 'titler' sektion"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:77
 msgid "Include 'Recently Added' Section"
-msgstr ""
+msgstr "Inkludér 'tilføjet for nylig' sektion"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:78
 msgid "Sort numbers as text"
-msgstr ""
+msgstr "Sortér numre som tekst"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_tab_template_ui.py:28
 msgid "Tab template for catalog.ui"
-msgstr ""
+msgstr "Tab skabelon til katalog.ui"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/bulk.py:36
 msgid ""
@@ -2807,19 +3921,22 @@ msgid ""
 "in a previous conversion (if they exist) instead of using the defaults "
 "specified in the Preferences"
 msgstr ""
+"For indstillinger som ikke kan vælges i denne dialog, brug værdier gemt fra "
+"tidligere konverteringer (hvis de eksisterer) istedet for at anvende de "
+"standard givne indstillinger"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/bulk.py:67
 msgid "Bulk Convert"
-msgstr ""
+msgstr "Klynge konvertering"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/bulk.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/single.py:185
 msgid "Options specific to the output format."
-msgstr ""
+msgstr "Muligheder specifikt for output-formatet."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input.py:15
 msgid "Comic Input"
-msgstr ""
+msgstr "Tegneserie-input"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input.py:16
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input.py:13
@@ -2827,91 +3944,91 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input.py:13
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input.py:13
 msgid "input"
-msgstr ""
+msgstr "input"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:94
 msgid "&Number of Colors:"
-msgstr ""
+msgstr "&Number af farver:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:90
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:96
 msgid "Disable &normalize"
-msgstr ""
+msgstr "Deaktivér &normalize"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:91
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:97
 msgid "Keep &aspect ratio"
-msgstr ""
+msgstr "Behold &aspect ratio"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:92
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:98
 msgid "Disable &Sharpening"
-msgstr ""
+msgstr "Deaktivér &Sharpening"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:104
 msgid "Disable &Trimming"
-msgstr ""
+msgstr "Deaktivér &Trimming"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:94
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:103
 msgid "&Wide"
-msgstr ""
+msgstr "&Wide"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:95
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:99
 msgid "&Landscape"
-msgstr ""
+msgstr "&Landscape"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:96
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:101
 msgid "&Right to left"
-msgstr ""
+msgstr "&Right to left"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:100
 msgid "Don't so&rt"
-msgstr ""
+msgstr "Sortér ikke"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:98
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:102
 msgid "De&speckle"
-msgstr ""
+msgstr "De&speckle"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:99
 msgid "&Disable comic processing"
-msgstr ""
+msgstr "&Deaktivér tegneserie processering"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:100
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/single_ui.py:111
 msgid "&Output format:"
-msgstr ""
+msgstr "&Output-format:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:101
 msgid "Disable conversion of images to &black and white"
-msgstr ""
+msgstr "Deaktivér konvertering af billeder til &sort og hvid"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:19
 msgid "Debug"
-msgstr ""
+msgstr "Fejlsøgning"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:21
 msgid "Debug the conversion process."
-msgstr ""
+msgstr "Fejlsøg konverteringsprocessen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:38
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:51
 msgid "Choose debug folder"
-msgstr ""
+msgstr "Vælg fejlsøgningsmappe"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:57
 msgid "Invalid debug directory"
-msgstr ""
+msgstr "Ugyldig fejlsøgningsmappe"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:58
 msgid "Failed to create debug directory"
-msgstr ""
+msgstr "Fejlsøgningsmappe oprettelse fejlede"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:50
 msgid ""
@@ -2920,46 +4037,11 @@ msgid ""
 "understanding the conversion process and figuring out the correct values for "
 "conversion parameters like Table of Contents and Chapter Detection."
 msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:52
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:53
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:125
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:171
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:52
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:507
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:521
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:522
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:538
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:539
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:364
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:378
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:389
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:391
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:393
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:398
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:400
-#: /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:267
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:365
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:367
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:374
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:377
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:379
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:381
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:75
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:80
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:186
-msgid "..."
-msgstr ""
+"Vælg en mappe til at putte fejlsøgnings-output i. Hvis du angiver en mappe, "
+"vil calibre gemme en masse fejlsøgnings-output i den. Dette er nyttigt for "
+"at forstå konverteringsprocessen og til at finde ud af de korrekte værdier "
+"til konverteringsparametrene som f.eks. indholdsfortegnelse og kapitel "
+"detektering."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54
 msgid ""
@@ -2967,10 +4049,13 @@ msgid ""
 "of the conversion process. This HTML can sometimes serve as a good starting "
 "point for hand editing a conversion."
 msgstr ""
+"Fejlsøgningsprocessen sender mellem HTML genereret på forskellige trin af "
+"konverteringsprocessen. Denne HTML kan nogle gange udgøre et godt "
+"udgangspunkt ved manuel konvertering."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output.py:15
 msgid "EPUB Output"
-msgstr ""
+msgstr "EPUB-output"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:49
 msgid "Do not &split on page breaks"
@@ -2978,46 +4063,46 @@ msgstr "Del &ikke ved sideskift"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:50
 msgid "No default &cover"
-msgstr ""
+msgstr "Intet standard &omslag"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:51
 msgid "No &SVG cover"
-msgstr ""
+msgstr "Intet &SVG omslag"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:52
 msgid "Preserve cover &aspect ratio"
-msgstr ""
+msgstr "Bevar omslags &aspektforhold"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:53
 msgid "Split files &larger than:"
-msgstr ""
+msgstr "Del filer &større end:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:54
 msgid " KB"
-msgstr ""
+msgstr " kB"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input.py:12
 msgid "FB2 Input"
-msgstr ""
+msgstr "FB2-input"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:29
 msgid "Do not insert a &Table of Contents at the beginning of the book."
-msgstr ""
+msgstr "Indsæt ikke en &indholdsfortegnelse ved starten af bogen."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output.py:14
 msgid "FB2 Output"
-msgstr ""
+msgstr "FB2-output"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:29
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_output_ui.py:37
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/rb_output_ui.py:29
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:47
 msgid "&Inline TOC"
-msgstr ""
+msgstr "&indlejret indholdsfortegnelse"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:99
 msgid "Font rescaling wizard"
-msgstr ""
+msgstr "Skriftstype reskaleringsguide"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:100
 msgid ""
@@ -3034,20 +4119,33 @@ msgid ""
 "ebook.com/user_manual/conversion.html#font-size-rescaling\">User Manual</a> "
 "for a discussion of how font size rescaling works.</p>"
 msgstr ""
+"<p>Denne guide vil hjælpe dig med at vælge en fornuftig "
+"skriftstørrelsesnøgle til dine behov. Bare indtast input-dokumentets "
+"grundskriftstørrelse og indtast en skriftstørrelse. Guiden vil vise hvad "
+"skriftstørrelsen vil afbildes til, af skrift reskaleringsalgoritmen. Du kan "
+"justere algoritmen ved at justere output grundskriftstørrelsen og "
+"skriftnøglen herunder. Når du har fundet nogle brugbare værdier, trykker du "
+"OK.</p>\n"
+"<p>Som udgangspunkt, hvis output grundskriftstørrelsen er zero og/eller "
+"ingen skriftstørrelsesnøgle er angivet, vil calibre anvende værdier fra "
+"output-profilen. </p>\n"
+"<p>Se <a href=\"http://calibre-ebook.com/user_manual/conversion.html#font-"
+"size-rescaling\">brugermanualen</a> for en diskussion af hvordan "
+"skriftstørrelse reskalering fungerer.</p>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:103
 msgid "&Output document"
-msgstr ""
+msgstr "&Output-dokument"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:109
 msgid "&Base font size:"
-msgstr ""
+msgstr "&Base skriftstørrelsen:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:105
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:123
 msgid "Font size &key:"
-msgstr ""
+msgstr "skriftstørrelse &key:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:106
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:110
@@ -3062,75 +4160,75 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:125
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:127
 msgid " pt"
-msgstr " pkt."
+msgstr " pkt"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:107
 msgid "Use &default values"
-msgstr ""
+msgstr "Anvend &default værdier"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:108
 msgid "&Input document"
-msgstr ""
+msgstr "&Input dokument"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:111
 msgid "&Font size: "
-msgstr ""
+msgstr "&Font størrelse: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:113
 msgid " will map to size: "
-msgstr ""
+msgstr " vil afbildes til størrelse: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:114
 msgid "0.0 pt"
-msgstr ""
+msgstr "0.0 pkt"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:16
 msgid "Look & Feel"
-msgstr ""
+msgstr "Udseende og fremtoning"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:18
 msgid "Control the look and feel of the output"
-msgstr ""
+msgstr "Styr outputtets udseende og fremtoning"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:30
 msgid "Original"
-msgstr ""
+msgstr "Oprindelig"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:31
 msgid "Left align"
-msgstr ""
+msgstr "Venstrestillet"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:32
 msgid "Justify text"
-msgstr ""
+msgstr "Justify tekst"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:120
 msgid "&Disable font size rescaling"
-msgstr ""
+msgstr "&Disable skriftstørrelse reskalering"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:121
 msgid "Base &font size:"
-msgstr "Grundlæggende &skriftstørrelse:"
+msgstr "Grund &font størrelse:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:124
 msgid "Wizard to help you choose an appropriate font size key"
-msgstr ""
+msgstr "Guide til at hjælpe dig med at vælge en skriftstørrelsesnøgle"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:126
 msgid "Line &height:"
-msgstr ""
+msgstr "Linje &height:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:128
 msgid "Input character &encoding:"
-msgstr ""
+msgstr "Input tegn &encoding:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:129
 msgid "Remove &spacing between paragraphs"
-msgstr "Fjern &afstand mellem afsnit"
+msgstr "Fjern &spacing mellem afsnit"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:130
 msgid "Indent size:"
-msgstr ""
+msgstr "Indryk størrelse:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:131
 msgid ""
@@ -3138,62 +4236,65 @@ msgid ""
 "paragraph indent, to ensure that paragraphs can be easily distinguished. "
 "This option controls the width of that indent."
 msgstr ""
+"<p>Når calibre fjerner afsnitsafstand, isætter calibre automatisk et "
+"afsnitsindryk, til at sikre at afsnittene er let synlige. Denne mulighed "
+"styrer bredden af indrykket."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:132
 msgid " em"
-msgstr ""
+msgstr " em"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:133
 msgid "Text justification:"
-msgstr ""
+msgstr "Tekst justering"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:134
 msgid "&Linearize tables"
-msgstr ""
+msgstr "&Linearize tabeller"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:135
 msgid "Extra &CSS"
-msgstr ""
+msgstr "Ekstra &CSS"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:136
 msgid "&Transliterate unicode characters to ASCII"
-msgstr ""
+msgstr "&Transliterate unicode tegn til ASCII"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137
 msgid "Insert &blank line"
-msgstr ""
+msgstr "Indsæt &blank linje"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:138
 msgid "Keep &ligatures"
-msgstr ""
+msgstr "Behold &ligatures"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output.py:19
 msgid "LRF Output"
-msgstr ""
+msgstr "LRF-output"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:116
 msgid "Enable &autorotation of wide images"
-msgstr ""
+msgstr "Aktivér &autorotation af brede billeder"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:117
 msgid "&Wordspace:"
-msgstr ""
+msgstr "&Ordmellemrum:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:119
 msgid "Minimum para. &indent:"
-msgstr ""
+msgstr "Minimum para. &indryk:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:121
 msgid "Render &tables as images"
-msgstr ""
+msgstr "Vis &tabeller som billeder"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:122
 msgid "Text size multiplier for text in rendered tables:"
-msgstr ""
+msgstr "Tekststørrelsesfaktor for tekst i tabeller:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:123
 msgid "Add &header"
-msgstr ""
+msgstr "Tilføj &sidehoved"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:124
 msgid "Header &separation:"
@@ -3201,384 +4302,388 @@ msgstr "&Sidehovedadskillelse"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:126
 msgid "Header &format:"
-msgstr ""
+msgstr "Sidehoved &format:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:127
 msgid "&Embed fonts"
-msgstr ""
+msgstr "&Indlejre skrifttyper:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:128
 msgid "&Serif font family:"
-msgstr ""
+msgstr "&Serif skriftsfamilie:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:129
 msgid "S&ans-serif font family:"
-msgstr ""
+msgstr "S&ans-serif skriftsfamilie:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:130
 msgid "&Monospaced font family:"
-msgstr ""
+msgstr "&Monospaced skriftsfamilie:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:114
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:195
 msgid "Metadata"
-msgstr ""
+msgstr "Metadata"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:43
 msgid ""
 "Set the metadata. The output file will contain as much of this metadata as "
 "possible."
 msgstr ""
+"Angiv metadata. Output-filen vil indeholde så meget metadata som muligt."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:164
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:99
 msgid "Choose cover for "
-msgstr ""
+msgstr "Vælg omslag til "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:171
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:106
 msgid "Cannot read"
-msgstr ""
+msgstr "Kan ikke læse"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:172
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:107
 msgid "You do not have permission to read the file: "
-msgstr ""
+msgstr "Du har ikke tilladelse til at læse filen: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:177
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:184
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:187
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:115
 msgid "Error reading file"
-msgstr ""
+msgstr "Fejl ved fillæsning"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:178
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:181
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:116
 msgid "<p>There was an error reading from file: <br /><b>"
-msgstr ""
+msgstr "<p>Der var en fejl ved læsning af filen: <br /><b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:188
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:124
 msgid " is not a valid picture"
-msgstr ""
+msgstr " er ikke valid billede"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:167
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:395
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:402
 msgid "Book Cover"
 msgstr "Bogomslag"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:403
+msgid "Change &cover image:"
+msgstr "Skift &cover billede:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:404
+msgid "Browse for an image to use as the cover of this book."
+msgstr "Browse efter et billede til at bruge som denne bogs omslag."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:172
 msgid "Use cover from &source file"
 msgstr "Brug omslag fra &kildefilen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:169
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:396
-msgid "Change &cover image:"
-msgstr "Udskift &omslagbillede:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:170
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:397
-msgid "Browse for an image to use as the cover of this book."
-msgstr "Led efter et billede til brug som omslag for bogen."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:173
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:363
 msgid "&Title: "
 msgstr "&Titel: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:173
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:364
 msgid "Change the title of this book"
 msgstr "Udskift bogens titel"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:174
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:143
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:367
 msgid "&Author(s): "
 msgstr "&Forfatter(e): "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:176
 msgid "Author So&rt:"
 msgstr "Forfatter So&rtering:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:176
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:177
 msgid ""
 "Change the author(s) of this book. Multiple authors should be separated by a "
 "comma"
 msgstr ""
 "Udskift bogens forfatter(e). Flere forfattere skal adskilles med et komma"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:177
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:152
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:178
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:376
 msgid "&Publisher: "
 msgstr "F&orlag: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:178
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:370
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:377
 msgid "Ta&gs: "
 msgstr "&Mærkater: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:179
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:154
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:378
 msgid ""
 "Tags categorize the book. This is particularly useful while searching. "
 "<br><br>They can be any words or phrases, separated by commas."
 msgstr ""
 "Mærkater placerer bogen i kategorier. Dette er særdeles brugbart til "
-"søgninger. <br><br>De kan være hvilkårlige ord eller sætninger, adskilt af "
+"søgninger. <br><br>De kan være vilkårlige ord eller sætninger, adskilt af "
 "kommaer."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:180
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:374
-msgid "&Series:"
-msgstr "&Serie"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:181
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:381
+msgid "&Series:"
+msgstr "&Serier:"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:182
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:160
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:161
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:375
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:183
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:176
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:383
 msgid "List of known series. You can add new series."
 msgstr "Liste over kendte serier. Du kan tilføje nye serier."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:184
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:388
 msgid "Book "
 msgstr "Bog "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output.py:20
 msgid "MOBI Output"
-msgstr ""
+msgstr "MOBI-output"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output.py:42
 msgid "Default"
-msgstr ""
+msgstr "Standard"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:67
 msgid "&Title for Table of Contents:"
-msgstr ""
+msgstr "&Indholdsfortegnelsestitel:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:68
 msgid "Rescale images for &Palm devices"
-msgstr ""
+msgstr "Reskalér billeder for &Palm-enheder"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:69
 msgid "Use author &sort for author"
-msgstr ""
+msgstr "Anvend forfatter &sort for forfatter"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:70
 msgid "Disable compression of the file contents"
-msgstr ""
+msgstr "Deaktivér kompression filens indhold"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:71
 msgid "Do not add Table of Contents to book"
-msgstr ""
+msgstr "Tilføj ikke indholdfortegnelse til bogen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:72
 msgid "Kindle options"
-msgstr ""
+msgstr "Kindle valgmuligheder"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:73
 msgid "Periodical masthead font:"
-msgstr ""
+msgstr "Tidsskrift masthead skrifttype:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:74
 msgid "Personal Doc tag:"
-msgstr ""
+msgstr "Personlig dokument mærke:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup.py:35
 msgid "Page Setup"
-msgstr ""
+msgstr "Sideopsætning"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:116
 msgid "&Output profile:"
-msgstr ""
+msgstr "&Output-profil:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:117
 msgid "Profile description"
-msgstr ""
+msgstr "Profil beskrivelse"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:118
 msgid "&Input profile:"
-msgstr ""
+msgstr "&Input-profil:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:119
 msgid "Margins"
-msgstr ""
+msgstr "Marginer"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:120
 msgid "&Left:"
-msgstr ""
+msgstr "&Venstre:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:122
 msgid "&Top:"
-msgstr ""
+msgstr "Ø&verst:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:124
 msgid "&Right:"
-msgstr ""
+msgstr "&Højre:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:126
 msgid "&Bottom:"
-msgstr ""
+msgstr "&Nederst:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_input.py:12
 msgid "PDB Input"
-msgstr ""
+msgstr "PDB-Input"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_input_ui.py:32
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:43
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:47
 msgid "Treat each &line as a paragraph"
-msgstr ""
+msgstr "Behandle hver &linje som et afsnit"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_input_ui.py:33
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:44
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:48
 msgid "Assume print formatting"
-msgstr ""
+msgstr "Formod udskriftsformattering"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_output.py:16
 msgid "PDB Output"
-msgstr ""
+msgstr "PDB-output"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_output_ui.py:36
 msgid "&Format:"
-msgstr ""
+msgstr "For&mater:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input.py:12
 msgid "PDF Input"
-msgstr ""
+msgstr "PDF-input"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input_ui.py:39
 msgid "Line &Un-Wrapping Factor:"
-msgstr ""
+msgstr "Linje &udpakningsfaktor:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input_ui.py:40
 msgid "No &Images"
-msgstr ""
+msgstr "Ingen &billeder"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output.py:17
 msgid "PDF Output"
-msgstr ""
+msgstr "PDF-output"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:40
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:43
 msgid "&Paper Size:"
-msgstr ""
+msgstr "&Papirstørrelse:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:41
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:44
 msgid "&Orientation:"
-msgstr ""
+msgstr "&Orientering:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:45
+msgid "Preserve &aspect ratio of cover"
+msgstr "Bevar omslagets &aspektforhold"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/rb_output.py:14
 msgid "RB Output"
-msgstr ""
+msgstr "RB-output"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:75
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2067
-msgid "Choose the format to view"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:82
 msgid "Cannot build regex using the GUI builder without a book."
 msgstr ""
+"Kan ikke danne build regex ved anvendelse af GUI builder uden en bog."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:82
 msgid "No formats available"
-msgstr ""
+msgstr "Ingen formater tilgængelige"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:100
 msgid "Open book"
-msgstr ""
+msgstr "Åben bog"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:52
 msgid "Regex Builder"
-msgstr ""
+msgstr "Regex bygger"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:53
 msgid "Preview"
-msgstr ""
+msgstr "Forhåndsvisning"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:54
 msgid "Regex:"
-msgstr ""
+msgstr "Regex:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:55
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:117
 msgid "Test"
-msgstr ""
+msgstr "Test"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/single.py:171
 msgid "Convert"
-msgstr ""
+msgstr "Konvertér"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/single.py:196
 msgid "Options specific to the input format."
-msgstr ""
+msgstr "Muligheder specifik for input-formatet."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/single_ui.py:108
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:64
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:91
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/progress_ui.py:48
 msgid "Dialog"
-msgstr ""
+msgstr "Dialogboks"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/single_ui.py:109
 msgid "&Input format:"
-msgstr ""
+msgstr "&Input-format:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/single_ui.py:110
 msgid "Use &saved conversion settings for individual books"
-msgstr ""
+msgstr "Anvend &saved konverteringsindstillinger for individuelle bøger"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:17
 msgid ""
 "Structure\n"
 "Detection"
 msgstr ""
+"Struktur\n"
+"Detektion"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:19
 msgid ""
 "Fine tune the detection of chapter headings and other document structure."
 msgstr ""
+"Fin juster kapiteloverskrift detektionen og andre dokumentstrukturer."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:34
 msgid "Detect chapters at (XPath expression):"
-msgstr ""
+msgstr "Detektér kapitler ved (XPath-udtryk):"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:35
 msgid "Insert page breaks before (XPath expression):"
-msgstr ""
+msgstr "Indsæt sideskift før (XPath-udtryk):"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:37
 msgid "Header regular expression:"
-msgstr ""
+msgstr "Sidehoved regulært udtryk:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:40
 msgid "Footer regular expression:"
-msgstr ""
+msgstr "Sidefod regulært udtryk:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:56
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:76
 msgid "Invalid regular expression"
-msgstr ""
+msgstr "Ugyldigt regulært udtryk"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:77
 msgid "Invalid regular expression: %s"
-msgstr ""
+msgstr "Ugyldigt regulært udtryk: %s"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:62
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:38
 msgid "Invalid XPath"
-msgstr ""
+msgstr "Ugyldig XPath"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:39
 msgid "The XPath expression %s is invalid."
-msgstr ""
+msgstr "XPath udtryk %s er ugyldig."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:60
 msgid "Chapter &mark:"
@@ -3586,53 +4691,55 @@ msgstr "Kapitel&markering:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:61
 msgid "Remove first &image"
-msgstr ""
+msgstr "Fjern første &billede"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:62
 msgid "Insert &metadata as page at start of book"
-msgstr ""
+msgstr "Indsæt &metadata som en side i starten af bogen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:63
 msgid "&Preprocess input file to possibly improve structure detection"
-msgstr ""
+msgstr "&Preprocess input-fil for muligvis at forbedre struktur detektion"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:64
 msgid "Remove F&ooter"
-msgstr ""
+msgstr "Fjern &sidefod"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:65
 msgid "Remove H&eader"
-msgstr ""
+msgstr "Fjern &sidehoved"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:16
 msgid ""
 "Table of\n"
 "Contents"
 msgstr ""
+"Indholds\n"
+"fortegnelse"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:18
 msgid "Control the creation/conversion of the Table of Contents."
-msgstr ""
+msgstr "Styr dannelsen/konverteringen af Indholdsfortegnelse."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:29
 msgid "Level &1 TOC (XPath expression):"
-msgstr ""
+msgstr "Niveau &1 indholdsfortegnelse (XPath-udtryk):"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:30
 msgid "Level &2 TOC (XPath expression):"
-msgstr ""
+msgstr "Niveau &2 indholdsfortegnelse (XPath-udtryk):"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:31
 msgid "Level &3 TOC (XPath expression):"
-msgstr ""
+msgstr "Niveau &3 indholdsfortegnelse (XPath-udtryk):"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:63
 msgid "Do not add &detected chapters to the Table of Contents"
-msgstr "Føj ikke &opdagede kapitler til indholdsfortegnelsen"
+msgstr "Tilføj ikke &detected kapitler til indholdsfortegnelsen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:64
 msgid "Number of &links to add to Table of Contents"
-msgstr "Antal &links at tilføje til indhldsfortegnelsen"
+msgstr "Antal &henvisninger at tilføje til indholdsfortegnelsen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:65
 msgid "Chapter &threshold"
@@ -3644,42 +4751,50 @@ msgstr "&Tving autogenereret indholdsfortegnelse"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:67
 msgid "TOC &Filter:"
-msgstr ""
+msgstr "Indholdsfortegnelse &Filter:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input.py:12
 msgid "TXT Input"
-msgstr ""
+msgstr "TXT-input"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:45
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:49
 msgid "Process using markdown"
-msgstr ""
+msgstr "Processér under anvendelse af markdown"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:50
 msgid ""
 "<p>Markdown is a simple markup language for text files, that allows for "
 "advanced formatting. To learn more visit <a "
 "href=\"http://daringfireball.net/projects/markdown\">markdown</a>."
 msgstr ""
+"<p>Markdown er et simpelt opmærkningssprog til tekstfiler, som tillader "
+"avanceret formattering. For at lære mere besøg <a "
+"href=\"http://daringfireball.net/projects/markdown\">markdown</a>."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:51
 msgid "Do not insert Table of Contents into output text when using markdown"
 msgstr ""
+"Indsæt ikke indholdsfortegnelser i output-tekst når markdown anvendes"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:52
+msgid "Preserve &spaces"
+msgstr "Bevar &spaces"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output.py:16
 msgid "TXT Output"
-msgstr ""
+msgstr "TXT-output"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:46
 msgid "&Line ending style:"
-msgstr ""
+msgstr "&Line slutstil:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:48
 msgid "&Maximum line length:"
-msgstr ""
+msgstr "&Maximum linjelængde:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:49
 msgid "Force maximum line lenght"
-msgstr ""
+msgstr "Håndhæv maximum linjelængde"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:50
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:65
@@ -3690,75 +4805,75 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/progress_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/progress_ui.py:50
 msgid "TextLabel"
-msgstr ""
+msgstr "Tekstetiket"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:51
 msgid "Use a wizard to help construct the XPath expression"
-msgstr ""
+msgstr "Anvend en guide til at hjælpe med at konstruere XPath-udtrykket"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:68
 msgid "Match HTML &tags with tag name:"
-msgstr ""
+msgstr "Match HTML &tags med mærkenavne:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:69
 msgid "*"
-msgstr ""
+msgstr "*"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:70
 msgid "a"
-msgstr ""
+msgstr "a"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:71
 msgid "br"
-msgstr ""
+msgstr "br"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72
 msgid "div"
-msgstr ""
+msgstr "div"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:73
 msgid "h1"
-msgstr ""
+msgstr "h1"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:74
 msgid "h2"
-msgstr ""
+msgstr "h2"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:75
 msgid "h3"
-msgstr ""
+msgstr "h3"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:76
 msgid "h4"
-msgstr ""
+msgstr "h4"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:77
 msgid "h5"
-msgstr ""
+msgstr "h5"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:78
 msgid "h6"
-msgstr ""
+msgstr "h6"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:79
 msgid "hr"
-msgstr ""
+msgstr "hr"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:80
 msgid "span"
-msgstr ""
+msgstr "span"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:81
 msgid "Having the &attribute:"
-msgstr ""
+msgstr "Havende &attribut:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:82
 msgid "With &value:"
-msgstr ""
+msgstr "Med &værdi:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:83
 msgid "(A regular expression)"
-msgstr ""
+msgstr "(Et regulært udtryk)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:84
 msgid ""
@@ -3769,884 +4884,1150 @@ msgid ""
 "tag.</p><p>To learn more advanced usage of XPath see the <a "
 "href=\"http://calibre-ebook.com/user_manual/xpath.html\">XPath Tutorial</a>."
 msgstr ""
+"<p>F.eks. for at matche alle h2 mærker som har class=\"chapter\", sættes "
+"mærke til <i>h2</i>, attribut til <i>class</i> og værdi til "
+"<i>chapter</i>.</p><p>Hvis attributten efterlades blank vil der matches "
+"enhver attribut - og efterlades værdi blank vil der matches enhver værdi. "
+"Sættes mærke til * vil der match enhvert mærke.</p><p>For at lære mere "
+"avanceret brug af XPath, se <a href=\"http://calibre-"
+"ebook.com/user_manual/xpath.html\">XPath-tutorial</a>."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:127
+msgid "Cover browser could not be loaded"
+msgstr "Omslag browser kunne ikke loades"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:179
+msgid "Browse by covers"
+msgstr "Browse efter omslag"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:205
+#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:242
+msgid "Undefined"
+msgstr "Udefineret"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:133
+msgid "Yes"
+msgstr "Ja"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:134
+msgid "No"
+msgstr "Nej"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:115
+msgid "star(s)"
+msgstr "stjerne(r)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:116
+msgid "Unrated"
+msgstr "Ikke bedømt"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:249
+msgid " index:"
+msgstr " indeks:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:432
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:183
+msgid "Automatically number books in this series"
+msgstr "Automatisk nummerér bøger i denne serie"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:475
+msgid "Remove all tags"
+msgstr "Fjern alle mærker"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:496
+msgid "tags to add"
+msgstr "Mærker at tilføje"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:501
+msgid "tags to remove"
+msgstr "Mærker at fjerne"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:49
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:135
 msgid "No details available."
-msgstr ""
+msgstr "Ingen detaljer tilgængelig."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:155
 msgid "Device no longer connected."
-msgstr ""
+msgstr "Enhed er ikke længere forbundet."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:208
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:271
 msgid "Get device information"
-msgstr ""
+msgstr "Hent enhedsinformation"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:219
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:282
 msgid "Get list of books on device"
-msgstr ""
+msgstr "Hent liste af bøger fra enheden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:292
 msgid "Get annotations from device"
-msgstr ""
+msgstr "Hent noter fra enheden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:301
 msgid "Send metadata to device"
-msgstr ""
+msgstr "Send metadata til enheden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:247
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:306
+msgid "Send collections to device"
+msgstr "Send collections til enheden"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:330
 msgid "Upload %d books to device"
-msgstr ""
+msgstr "Upload %d bøger til enheden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:345
 msgid "Delete books from device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:279
-msgid "Download books from device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:289
-msgid "View book on device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:296
-msgid "and delete from library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:319
-msgid "Set default send to device action"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:324
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:331
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:333
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:335
-msgid "Email to"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:346
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:353
-msgid "Send to main memory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:348
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:355
-msgid "Send to storage card A"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:350
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:357
-msgid "Send to storage card B"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:360
-msgid "Send specific format to main memory"
-msgstr ""
+msgstr "Slet bøger fra enheden"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:362
-msgid "Send specific format to storage card A"
-msgstr ""
+msgid "Download books from device"
+msgstr "Download bøger fra enheden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:364
-msgid "Send specific format to storage card B"
-msgstr ""
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:372
+msgid "View book on device"
+msgstr "Se bøger på enheden"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:408
+msgid "Set default send to device action"
+msgstr "Angiv standard send til enhedsaktion"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:425
+msgid "Email to"
+msgstr "E-mail til"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:425
+msgid " and delete from library"
+msgstr " og slet fra bibliotek"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:434
+msgid "Send to main memory"
+msgstr "Send til arbejdshukommelse"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:436
+msgid "Send to storage card A"
+msgstr "Send til hukommelseskort A"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:438
+msgid "Send to storage card B"
+msgstr "Send til hukommelseskort B"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:452
+msgid "Main Memory"
+msgstr "Arbejdshukommelse"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:470
+msgid "Send and delete from library"
+msgstr "Send og slet fra bibliotek"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:471
+msgid "Send specific format"
+msgstr "Send specifik format"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:510
+msgid "Connect to folder"
+msgstr "Forbind til mappe"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:516
+msgid "Connect to iTunes"
+msgstr "Forbind til iTunes"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:521
+msgid "Eject device"
+msgstr "Skub enhed ud"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:529
 msgid "Fetch annotations (experimental)"
-msgstr ""
+msgstr "Hent noter (eksperimentiel)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:639
+msgid "Error communicating with device"
+msgstr "Kommunikationsfejl med enheden"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:660
+msgid "Select folder to open as device"
+msgstr "Vælg mappe til at åbne som enhed"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:705
+msgid "Failed"
+msgstr "Fejlede"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:711
+msgid "Error talking to device"
+msgstr "Fejl ved kommunikation med enhed"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:712
+msgid ""
+"There was a temporary error talking to the device. Please unplug and "
+"reconnect the device and or reboot."
+msgstr ""
+"Der var en midlertidig fejl ved kommunikation med enheden. Afbryd og "
+"genforbind enheden eller genstart."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:754
+msgid "Device: "
+msgstr "Enhed: "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:756
+msgid " detected."
+msgstr " detekteret."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
-msgstr ""
+msgstr "valgt til at sende"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:847
 msgid "Choose format to send to device"
-msgstr ""
+msgstr "Vælg format til at sende til enheden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:856
 msgid "No device"
-msgstr ""
+msgstr "Ingen enhed"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:857
 msgid "Cannot send: No device is connected"
-msgstr ""
+msgstr "Kan ikke sende: Ingen enhed er forbundet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:534
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:538
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:860
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "No card"
-msgstr ""
+msgstr "Intet hukommelseskort"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:535
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:539
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
 msgid "Cannot send: Device has no storage card"
-msgstr ""
+msgstr "Kan ikke sende: Enheden har intet hukommelseskort"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:906
 msgid "E-book:"
-msgstr ""
+msgstr "E-bog:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:909
 msgid "Attached, you will find the e-book"
-msgstr ""
+msgstr "Tilknyttet, vil du finde e-bogen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:585
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:177
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:910
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:181
 msgid "by"
-msgstr ""
+msgstr "af"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:586
-msgid "in the %s format."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:599
-msgid "Sending email to"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:629
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:636
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:728
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:788
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:904
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:911
+msgid "in the %s format."
+msgstr "i %s formatet."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:924
+msgid "Sending email to"
+msgstr "Sender e-mail til"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:954
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:962
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1054
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1235
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1243
 msgid "No suitable formats"
-msgstr ""
+msgstr "Ingen egnede formater"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:630
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:955
 msgid "Auto convert the following books before sending via email?"
-msgstr ""
+msgstr "Auto konvertér følgende bøger før sending via e-mail?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:637
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:963
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
+"Kunne ikke e-maile følgende bøger da ingen egnede formater blev fundet:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:655
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:981
 msgid "Failed to email books"
-msgstr ""
+msgstr "Fejlede med at e-maile bøger"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:656
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:982
 msgid "Failed to email the following books:"
-msgstr ""
+msgstr "Fejlede med at e-maile følgende bøger:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:660
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:986
 msgid "Sent by email:"
-msgstr ""
+msgstr "Sendt via e-mail:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:687
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1013
 msgid "News:"
-msgstr ""
+msgstr "Nyheder:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:688
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1014
 msgid "Attached is the"
-msgstr ""
+msgstr "Forbundet er"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1025
 msgid "Sent news to"
-msgstr ""
+msgstr "Send nyheder til"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:729
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:789
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:905
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1055
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1117
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1236
 msgid "Auto convert the following books before uploading to the device?"
-msgstr ""
+msgstr "Auto konvertér følgende bøger før upload til enheden?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:758
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1085
 msgid "Sending catalogs to device."
-msgstr ""
+msgstr "Sender kataloger til enheden."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:819
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1149
 msgid "Sending news to device."
-msgstr ""
+msgstr "Sender nyheder til enheden."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1202
 msgid "Sending books to device."
-msgstr ""
+msgstr "Sender bøger til enheden."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:912
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1244
 msgid ""
 "Could not upload the following books to the device, as no suitable formats "
 "were found. Convert the book(s) to a format supported by your device first."
 msgstr ""
+"Kunne ikke uploade følgende bøger til enheden, da ingen egnede formater blev "
+"fundet. Konvertér bog/bøgerne til et format understøttet af din enhed først."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:960
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1305
 msgid "No space on device"
-msgstr ""
+msgstr "Ingen plads på enheden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:961
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1306
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
+"<p>Kan ikke uploade bøger til enheden, der er ikke mere fri plads "
+"tilgængelig "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:78
 msgid "Select available formats and their order for this device"
-msgstr ""
+msgstr "Vælg tilgængelige formater og deres prioritet til denne enhed"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:82
 msgid "Use sub directories"
-msgstr ""
+msgstr "Brug undermapper"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:81
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:83
+msgid "Use author sort for author"
+msgstr "Brug forfatter sortering til forfatter"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:85
 msgid "Save &template:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:114
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:373
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1101
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:93
-msgid "Path"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:117
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:118
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:119
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:122
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:216
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:372
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:94
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:151
-msgid "Formats"
-msgstr ""
+msgstr "Gem &skabelon:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:68
 msgid "Fit &cover to view"
-msgstr ""
+msgstr "Tilpas &omslag til visning"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:69
 msgid "&Previous"
-msgstr ""
+msgstr "&Forrige"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:70
 msgid "&Next"
-msgstr ""
+msgstr "&Næste"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog.py:38
 msgid "My Books"
-msgstr ""
+msgstr "Mine bøger"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:69
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:289
 msgid "Generate catalog"
-msgstr ""
+msgstr "Generér katalog"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:70
 msgid "Generate catalog for {0} books"
-msgstr ""
+msgstr "Generér katalog til {0} bøger"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:71
 msgid "Catalog &format:"
-msgstr ""
+msgstr "Katalog &format:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:72
 msgid ""
 "Catalog &title (existing catalog with the same title will be replaced):"
 msgstr ""
+"Katalog &titel (eksisterende katalog med samme titel vil blive udskiftet):"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:73
 msgid "&Send catalog to device automatically"
-msgstr ""
+msgstr "&Send automatisk katalog til enhed"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:74
 msgid "Catalog options"
-msgstr ""
+msgstr "Katalog valgmuligheder"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_ui.py:40
 msgid "Choose Format"
-msgstr ""
+msgstr "Vælg format"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:33
 msgid "Set defaults for conversion of comics (CBR/CBZ files)"
-msgstr ""
+msgstr "Angiv standard for konvertering af tegneserier (CBR/CBZ-filer)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
 msgid "Set options for converting %s"
-msgstr ""
+msgstr "Angiv muligheder ved konvertering %s"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:92
 msgid "&Title:"
-msgstr ""
+msgstr "&Titel:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:93
 msgid "&Author(s):"
-msgstr ""
+msgstr "Forfatter(e):"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:95
 msgid "&Profile:"
-msgstr ""
+msgstr "&Profil:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog_ui.py:41
+msgid "Edit Comments"
+msgstr "Redigér kommentar"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:174
 msgid "%(plugin_type)s %(plugins)s"
-msgstr ""
+msgstr "%(plugin_type)s %(plugins)s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:175
 msgid "plugins"
-msgstr ""
+msgstr "udvidelsesmoduler"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:184
 msgid ""
 "\n"
 "Customization: "
 msgstr ""
+"\n"
+"Tilpasning: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:200
 msgid "Conversion"
-msgstr ""
+msgstr "Konvertering"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:200
 msgid "General"
-msgstr ""
+msgstr "Generel"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:200
 msgid "Interface"
-msgstr ""
+msgstr "Brugergrænseflade"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:201
 msgid "Add/Save"
-msgstr ""
+msgstr "Tilføj/Gem"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:201
 msgid ""
 "Email\n"
 "Delivery"
 msgstr ""
+"E-mail\n"
+"levering"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:202
 msgid "Advanced"
-msgstr ""
+msgstr "Avanceret"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:202
 msgid ""
 "Content\n"
 "Server"
 msgstr ""
+"Indholds\n"
+"Server"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:202
 msgid "Plugins"
-msgstr ""
+msgstr "Udvidelsesmoduler"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:220
 msgid "Auto send"
-msgstr ""
+msgstr "Auto send"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:220
 msgid "Email"
-msgstr ""
+msgstr "E-mail"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:221
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:225
 msgid "Formats to email. The first matching format will be sent."
-msgstr ""
+msgstr "Formatér til e-mail. Det første matchende format vil blive sendt."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:222
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:226
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
 msgstr ""
+"Hvis valgt, downloadede nyheder vil automatisk blive e-mailet <br>til denne "
+"email-adresse (forudsat nyheden er i en af de listede formater)."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:300
 msgid "new email address"
-msgstr ""
+msgstr "ny e-mail adresse"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:472
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:490
+msgid "Wide"
+msgstr "Bred"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:491
+msgid "Narrow"
+msgstr "Smal"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:503
 msgid "System port selected"
-msgstr ""
+msgstr "System port valgt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:473
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:504
 msgid ""
 "The value <b>%d</b> you have chosen for the content server port is a system "
-"port. You operating system <b>may</b> not allow the server to run on this "
+"port. Your operating system <b>may</b> not allow the server to run on this "
 "port. To be safe choose a port number larger than 1024."
 msgstr ""
+"Værdien <b>%d</b> du har valgt til indholdsserverens port er en system "
+"tcp/udp-port. Dit operativsystem <b>kan måske</b> ikke tillade serveren at "
+"udbyde sig på denne port. For at være sikker kan du vælge en port højere end "
+"1024 (op til 65535)."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:492
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:837
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:176
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1538
-#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
-msgid "Error"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:493
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:524
 msgid "Failed to install command line tools."
-msgstr ""
+msgstr "Fejlede med at installere kommandolinje værktøj."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:496
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:527
 msgid "Command line tools installed"
-msgstr ""
+msgstr "Kommandolinje værktøj installeret"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:497
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:528
 msgid "Command line tools installed in"
-msgstr ""
+msgstr "Kommandolinje værktøj installeret i"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:498
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:529
 msgid ""
 "If you move calibre.app, you have to re-install the command line tools."
 msgstr ""
+"Hvis du flytter calibre.app, kan du behøve at geninstallere kommandolinje "
+"værktøjet."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:580
 msgid "No valid plugin path"
-msgstr ""
+msgstr "Ingen gyldig udvidelsesmodulsti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:581
 msgid "%s is not a valid plugin path"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:553
-msgid "Choose plugin"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:565
-msgid "Plugin cannot be disabled"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:566
-msgid "The plugin: %s cannot be disabled"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:575
-msgid "Plugin not customizable"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:576
-msgid "Plugin: %s does not need customization"
-msgstr ""
+msgstr "%s er ikke en gyldig udvidelsesmodulsti"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:584
+msgid "Choose plugin"
+msgstr "Vælg udvidelsesmodul"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:596
+msgid "Plugin cannot be disabled"
+msgstr "Udvidelsesmodul kan ikke deaktiveres"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:597
+msgid "The plugin: %s cannot be disabled"
+msgstr "Udvidelsesmodulet: %s kan ikke deaktiveres"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:606
+msgid "Plugin not customizable"
+msgstr "Udvidelsesmodul kan ikke tilpasses"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:607
+msgid "Plugin: %s does not need customization"
+msgstr "Udvidelsesmodul: %s behøver ingen til tilpasning"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:615
 msgid "Customize"
-msgstr ""
+msgstr "Tilpas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:653
 msgid "Cannot remove builtin plugin"
-msgstr ""
+msgstr "Kan ikke fjerne indbyggede udvidelsesmoduler"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:654
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
+" kan ikke fjernes. Det er et indbygget udvidelsesmodul. Prøv at deaktivere "
+"det istedet."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:656
-msgid "Error log:"
-msgstr ""
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:685
+msgid "You must select a column to delete it"
+msgstr "Du må vælge en kolonne for at slette den"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:663
-msgid "Access log:"
-msgstr ""
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:690
+msgid "The selected column is not a custom column"
+msgstr "Den valgte kolonne er en tilpasset kolonne"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:691
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:701
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
+msgid "Are you sure?"
+msgstr "Er du sikker?"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:692
+msgid "Do you really want to delete column %s and all its data?"
+msgstr "Vil du virkelig slette kolonne %s og alle dets data?"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:759
+msgid "Error log:"
+msgstr "Fejl log:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:766
+msgid "Access log:"
+msgstr "Tilgangslog:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:794
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:331
 msgid "Failed to start content server"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:715
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:586
-msgid "Select location for books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:723
-msgid "Invalid size"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:724
-msgid "The size %s is invalid. must be of the form widthxheight"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:778
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:783
-msgid "Invalid database location"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:779
-msgid "Invalid database location "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:780
-msgid "<br>Must be a directory."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:784
-msgid "Invalid database location.<br>Cannot write to "
-msgstr ""
+msgstr "Fejlede med at starte indholdsserveren"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:818
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:587
+msgid "Select location for books"
+msgstr "Vælg placering til bøger"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:825
+msgid "Invalid size"
+msgstr "Ugyldig størrelse"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:826
+msgid "The size %s is invalid. must be of the form widthxheight"
+msgstr "Størrelsen %s er ugyldig. må være af formen breddexhøjde"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:891
+msgid "Invalid database location"
+msgstr "Ugyldigt database placering"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:887
+msgid "Invalid database location "
+msgstr "Ugyldigt database placering "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:888
+msgid "<br>Must be a directory."
+msgstr "<br>Skal være et mappe."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:892
+msgid "Invalid database location.<br>Cannot write to "
+msgstr "Ugyldigt database placering.<br>Kan ikke skrive til "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:897
+msgid "Must restart"
+msgstr "Skal genstarte"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:898
+msgid ""
+"The changes you made require that Calibre be restarted. Please restart as "
+"soon as practical."
+msgstr ""
+"Ændringerne du lavede kræver at Calibre genstartes. Venligst genstart så "
+"hurtig som praktisk muligt."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:932
 msgid "Checking database integrity"
-msgstr ""
+msgstr "Checker database integritet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:838
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:952
 msgid "Failed to check database integrity"
-msgstr ""
+msgstr "Check af database integritet fejlede"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:843
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:957
 msgid "Some inconsistencies found"
-msgstr ""
+msgstr "Nogle inkonsistenser blev fundet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:844
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:958
 msgid ""
 "The following books had formats listed in the database that are not actually "
 "available. The entries for the formats have been removed. You should check "
 "them manually. This can happen if you manipulate the files in the library "
 "folder directly."
 msgstr ""
+"De følgende bøger havde formater listet i databasen som faktisk ikke er "
+"tilgængelige. Indgangene for formaterne er blevet fjernet. Du skal checke "
+"dem manuelt. Dette kan ske hvis du ændrer biblioteksmappens filer direkte."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:133
 msgid "TabWidget"
-msgstr ""
+msgstr "Tab-widget"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:134
 msgid ""
 "Here you can control how calibre will read metadata from the files you add "
 "to it. calibre can either read metadata from the contents of the file, or "
 "from the filename."
 msgstr ""
+"Her kan du styre hvordan calibre vil læse metadata fra filerne du tilføjer "
+"til den. Calibre kan enten læse metadata fra filindholdet, eller fra "
+"filnavnet."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:105
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:135
 msgid "Read metadata only from &file name"
-msgstr ""
+msgstr "Læs metadata fra kun &filnavnet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:106
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:136
 msgid ""
 "Swap the firstname and lastname of the author. This affects only metadata "
 "read from file names."
 msgstr ""
+"Byt forfatternes fornavn og efternavn. Dette påvirker kun metadata læst fra "
+"filnavne."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:137
 msgid "&Swap author firstname and lastname"
-msgstr ""
+msgstr "&Byt forfatter fornavn og efternavn"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:138
 msgid ""
 "If an existing book with a similar title and author is found that does not "
-"have the format being added, the format is added \n"
+"have the format being added, the format is added\n"
 "to the existing book, instead of creating a new entry. If the existing book "
 "already has the format, then it is silently ignored.\n"
 "\n"
 "Title match ignores leading indefinite articles (\"the\", \"a\", \"an\"), "
 "punctuation, case, etc. Author match is exact."
 msgstr ""
+"Hvis en eksisterende bog med en lignende titel og forfatter bliver fundet "
+"som ikke har formatet bliver tilføjet, bliver formatet tilføjet\n"
+"til den eksisterende bog, istedet for at danne nye indgange. Hvis den "
+"eksisterende bog allerede har formatet, så ignoreres den.\n"
+"\n"
+"Titel match ignorerer kendeord (\"en\", \"et\"), punktuation, kasus, osv. "
+"Forfatter match er eksakt."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:112
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:142
 msgid ""
 "If books with similar titles and authors found, &merge the new files "
 "automatically"
 msgstr ""
+"Hvis bøger med lignende titler og forfattere findes, &iflettes de nye filer "
+"automatisk"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:143
 msgid "&Configure metadata from file name"
-msgstr ""
+msgstr "&Konfigurér metadata fra filnavn"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:144
 msgid "&Adding books"
-msgstr ""
+msgstr "&Tilføjer bøger"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:145
 msgid ""
 "Here you can control how calibre will save your books when you click the "
 "Save to Disk button:"
 msgstr ""
+"Her kan du styre hvordan calibre vil gemme dine bøger når du trykker på gem-"
+"til-disk knappen:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:146
 msgid "Save &cover separately"
-msgstr ""
+msgstr "Gem &omslag separat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:147
 msgid "Update &metadata in saved copies"
-msgstr ""
+msgstr "Update &metadata i gemte kopier"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:148
 msgid "Save metadata in &OPF file"
-msgstr ""
+msgstr "Gem metadata i &OPF-fil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:149
 msgid "Convert non-English characters to &English equivalents"
-msgstr ""
+msgstr "Konvertér ikke-engelske tegn til &engelske ævivalenter"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:150
 msgid "Format &dates as:"
-msgstr ""
+msgstr "Formater &datoer som:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:151
 msgid "File &formats to save:"
-msgstr ""
+msgstr "Fil&formater ttil gemning:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:152
 msgid "Replace space with &underscores"
-msgstr ""
+msgstr "Erstat mellemrum med &bundstreg"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:153
 msgid "Change paths to &lowercase"
-msgstr ""
+msgstr "Ændre stier til &småbogstaver"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:154
 msgid "&Saving books"
-msgstr ""
+msgstr "&Gemmer bøger"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:155
+msgid "Metadata &management:"
+msgstr "Metadata &administrering:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:156
+msgid "Manual management"
+msgstr "Manual administering"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:157
+msgid "Only on send"
+msgstr "Kun på send"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:158
+msgid "Automatic management"
+msgstr "Automatisk administrering"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:159
+msgid ""
+"<li><b>Manual Management</b>: Calibre updates the metadata and adds "
+"collections only when a book is sent. With this option, calibre will never "
+"remove a collection.</li>\n"
+"<li><b>Only on send</b>: Calibre updates metadata and adds/removes "
+"collections for a book only when it is sent to the device. </li>\n"
+"<li><b>Automatic management</b>: Calibre automatically keeps metadata on the "
+"device in sync with the calibre library, on every connect</li></ul>"
+msgstr ""
+"<li><b>Manual administering</b>: Calibre opdaterer metadata og tilføjer "
+"collections kun når en bog bliver sendt. Med denne valgmulighed, vil calibre "
+"aldrig fjerne en collection.</li>\n"
+"<li><b>Kun på send</b>: Calibre opdaterer metadata og tilføjer/fjerner kun "
+"en bog fra collections når den sendes til en enhed. </li>\n"
+"<li><b>Automatisk forvaltning</b>: Calibre holder automatisk metadata på "
+"enheden synkroniseret med calibre biblioteket, ved hver forbindelse</li></ul>"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:162
 msgid ""
 "Here you can control how calibre will save your books when you click the "
 "Send to Device button. This setting can be overriden for individual devices "
 "by customizing the device interface plugins in Preferences->Plugins"
 msgstr ""
+"Her kan du styre hvordan calibre vil gemme dine bøger når du trykker på "
+"knappen send-til-enhed. Denne indstilling kan tilsidesættes for individuelle "
+"enheder ved at tilpasse enhedens udvidelsesmodulgrænseflade i Indstillinger-"
+">Udvidelser"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:163
 msgid "Sending to &device"
-msgstr ""
+msgstr "Sender til &enhed"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:504
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:174
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:201
 msgid "Preferences"
-msgstr ""
+msgstr "Indstillinger"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:505
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
 msgstr ""
+"&E-bogsplacering (E-bøgerne bliver gemt i mapper sorteret efter forfatter og "
+"metadata bliver gemt i filen metadata.db)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:506
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
 msgid "Browse for the new database location"
-msgstr ""
+msgstr "Browse til det nye database placering"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
 msgid "Show notification when &new version is available"
 msgstr "Giv besked når en &ny version er tilgængelig"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:509
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
 msgid "Download &social metadata (tags/ratings/etc.) by default"
-msgstr ""
+msgstr "Download &sociale metadata (mærker/vurderinger/osv.) som standard"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:510
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
 msgid "&Overwrite author and title by default when fetching metadata"
-msgstr ""
+msgstr "&Overskriv forfatter og titel som standard når metadata hentes"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
 msgid "Default network &timeout:"
-msgstr "Standard netværsks&timeout"
+msgstr "Standard netværks &timeout:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:512
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
 msgstr ""
-"Sætter standard timeouttiden for hentning fra netværket (dvs. hver gang vi "
-"henter information fra Internettet)"
+"Sætter standard timeouttiden for hentning fra netværket (f.eks.. hver gang "
+"vi henter information fra Internettet)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:513
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
 msgid " seconds"
 msgstr " sekunder"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
 msgid "Choose &language (requires restart):"
-msgstr "Vælg &sprog"
+msgstr "Vælg &sprog (kræver genstart):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
 msgid "Normal"
 msgstr "Normal"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:516
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
 msgid "High"
 msgstr "Høj"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:517
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
 msgid "Low"
 msgstr "Lav"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
 msgid "Job &priority:"
-msgstr "Opgave&prioritet"
+msgstr "Opgave&prioritet:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:519
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
 msgid "Preferred &output format:"
-msgstr ""
+msgstr "Foretrukken &output-format:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
 msgid "Preferred &input format order:"
-msgstr ""
+msgstr "Foretrukken &input-format sorteret:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
 msgid "Use &Roman numerals for series number"
-msgstr "Brug &Romertal til serienumre"
+msgstr "Brug &romertal til serienumre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:524
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
 msgid "Enable system &tray icon (needs restart)"
-msgstr "Aktiver s&tatusikon (kræver genstart)"
+msgstr "Aktivér s&tatusikon (kræver genstart)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
 msgid "Show &notifications in system tray"
 msgstr "Vis beskeder i &statusfeltet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
+msgid "Show &splash screen at startup"
+msgstr "Vis &startskærm ved opstart"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr "Vis omslagfremviseren i et separat vindue (kræver genstart)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:527
-msgid "Search as you type"
-msgstr ""
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
+msgid "Show &average ratings in the tags browser"
+msgstr "Vis &middelvurderinger i mærkefremviseren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
+msgid "Search as you type"
+msgstr "Søg mens du taster"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr "Send automatisk hentede &nyheder til e-bogslæseren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:529
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
 msgid "&Delete news from library when it is automatically sent to reader"
 msgstr ""
 "Slet nyheder &fra biblioteket når de automatisk bliver sendt til læseren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
 msgid "&Number of covers to show in browse mode (needs restart):"
-msgstr "&Antal viste omslag i fremviseren (kræver genstart)"
+msgstr "&Antal viste omslag i fremviseren (kræver genstart):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
 msgid "Toolbar"
 msgstr "Værktøjslinje"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:532
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
 msgid "Large"
 msgstr "Stor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
 msgid "Medium"
 msgstr "Medium"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
 msgid "Small"
 msgstr "Lille"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
 msgid "&Button size in toolbar"
 msgstr "Størrelse på knapper i værktøjslinjen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
 msgid "Show &text in toolbar buttons"
 msgstr "Vis &tekst på knapper i værktøjslinien"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:537
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
 msgid "Select visible &columns in library view"
 msgstr "Vælg de synlige &kolonner i biblioteksvisningen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
+msgid "Remove a user-defined column"
+msgstr "Fjern en brugerdefineret kolonne"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+msgid "Add a user-defined column"
+msgstr "Tilføj en brugerdefineret kolonne"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
+msgid "Edit settings of a user-defined column"
+msgstr "Redigér en brugerdefineret kolonnes indstillinger"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
 msgid "Use internal &viewer for:"
 msgstr "Brug intern &viser for:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
+msgid "User Interface &layout (needs restart):"
+msgstr "Brugergrænseflade &layout (behøver genstart):"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
+msgid "Disable all animations. Useful if you have a slow/old computer."
+msgstr ""
+"Deaktivér alle animationer. Nyttigt hvis du har en gammel/langsom computer."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
+msgid "Disable &animations"
+msgstr "Deaktivér &animationer"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
+msgid "Show &donate button (restart)"
+msgstr "Vis &donationsknap (genstart)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
 msgid "Add an email address to which to send books"
 msgstr "Tilføj en e-mailadresse at sende bøgerne til"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:542
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
 msgid "&Add email"
 msgstr "&Tilføj e-mail"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
 msgid "Make &default"
-msgstr ""
+msgstr "Ændre til &standard"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:544
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
 msgid "&Remove email"
-msgstr ""
+msgstr "&Fjern e-mail"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:545
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
 msgid ""
 "calibre can send your books to you (or your reader) by email. Emails will be "
 "automatically sent for downloaded news to all email addresses that have Auto-"
 "send checked."
 msgstr ""
+"Calibre kan sende bøger til dig (eller din læser) via e-mail. E-mails sendes "
+"automatisk med nyheder til alle e-mail-adresser, som har auto-send markeret."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:546
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
 msgid "&Maximum number of waiting worker processes (needs restart):"
-msgstr ""
+msgstr "&Maksimalt antal ventende arbejdsprocesser (genstart krævet):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:547
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
 msgid "&Check database integrity"
-msgstr ""
+msgstr "&Check database integritet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
 msgid "&Install command line tools"
-msgstr ""
+msgstr "&Installér kommandolinje værktøj"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
 msgid "Open calibre &configuration directory"
-msgstr ""
+msgstr "Åben calibre &konfigurationsmappe"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
 msgid "Limit the max. simultaneous jobs to the available CPU &cores"
 msgstr ""
+"Begræns maks. antal samtidige opgaver til antallet at CPUer og &kerner"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
 msgid "Debug &device detection"
-msgstr ""
+msgstr "Fejlfind &enhedsdetektion"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
 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 indeholder en netværksserver som tillader dig at tilgå dine "
+"bogsamling via en  browser fra overalt i verden. Enhver ændring af "
+"indstillingerne tager først effekt efter en server genstart."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
 msgid "Server &port:"
-msgstr ""
+msgstr "Server &port:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:212
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:117
 msgid "&Username:"
-msgstr ""
+msgstr "Br&ugernavn:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:213
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:119
 msgid "&Password:"
-msgstr ""
+msgstr "&Adgangskode:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
 msgstr ""
+"Hvis lader din adgangskode blank, kan enhver tilgå din bogsamling via www."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
 msgstr ""
+"Maksimumstørrelse (breddexhøjde) for viste omslag. Større omslag bliver "
+"nedskaleret. "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
 msgid "Max. &cover size:"
-msgstr ""
+msgstr "Maks. &omslagsstørrelse:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:621
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:214
 msgid "&Show password"
-msgstr ""
+msgstr "Vi&s adgangskode"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
 msgid "Max. &OPDS items per query:"
-msgstr ""
+msgstr "Maks. &OPDS poster per forespørgsel:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
+msgid "Max. OPDS &ungrouped items:"
+msgstr "Maks. OPDS &ugrupperede poster:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
 msgid "&Start Server"
-msgstr ""
+msgstr "&Start server"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
 msgid "St&op Server"
-msgstr ""
+msgstr "St&op server"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:626
 msgid "&Test Server"
-msgstr ""
+msgstr "&Test server"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
 msgid "Run server &automatically on startup"
-msgstr ""
+msgstr "Start &automatisk server ved start"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:628
 msgid "View &server logs"
-msgstr ""
+msgstr "Vis &server logs"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:46
 msgid ""
 "<p>Remember to leave calibre running as the server only runs as long as "
@@ -4656,120 +6037,259 @@ msgid ""
 "on your iPhone. Here myhostname should be the fully qualified hostname or "
 "the IP address of the computer calibre is running on."
 msgstr ""
+"<p>Husk at lade calibre køre, da serveren kun kører sålænge calibre kører.\n"
+"<p>Stanza skulle automatisk se din calibre samling. Hvis ikke, så prøv at "
+"tilføje URL http://mitværtsnavn:8080 som et nyt katalog i Stanza læseren på "
+"din iPhone. Her skal mitværtsnavn være det fuldt kvalificerede domænenavn "
+"(FQDN) eller IP-adressen på computeren calibre kører på."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:631
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
 msgstr ""
+"Her kan du tilpasse Calibre opførsel ved at styre hvilke udvidelsesmoduler "
+"den bruger."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:632
 msgid "Enable/&Disable plugin"
-msgstr ""
+msgstr "Aktivér/&deaktivér udvidelsesmodul"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:633
 msgid "&Customize plugin"
-msgstr ""
+msgstr "&Tilpas udvidelsesmodul"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:634
 msgid "&Remove plugin"
-msgstr ""
+msgstr "&Fjern udvidelsesmodul"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:635
 msgid "Add new plugin"
-msgstr ""
+msgstr "Tilføj nyt udvidelsesmodul"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:636
 msgid "Plugin &file:"
-msgstr ""
+msgstr "Udvidelsesmodul&fil:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:638
 msgid "&Add"
-msgstr ""
+msgstr "&Tilføj"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:125
 msgid "Create Tag-based Column"
-msgstr ""
+msgstr "Opret mærkebaseret kolonne"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:126
 msgid "Lookup name"
-msgstr ""
+msgstr "Søgenavn"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:127
 msgid "Column heading"
-msgstr ""
+msgstr "Kolonneoverskrift"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:128
 msgid "Column type"
-msgstr ""
+msgstr "Kolonnetype"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:129
 msgid "Use brackets"
-msgstr ""
+msgstr "Anvend parentes"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:130
 msgid "Values can be edited"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:133
-msgid "Yes"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:134
-msgid "No"
-msgstr ""
+msgstr "Værdier som kan redigeres"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:135
 msgid "Text"
-msgstr ""
+msgstr "Tekst"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:136
 msgid "Number"
-msgstr ""
+msgstr "Tal"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:177
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1162
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:31
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:889
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Date"
-msgstr ""
+msgstr "Dato"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:138
 msgid "Tag on book"
-msgstr ""
+msgstr "Mærke på bog"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:139
 msgid "Explanation text added in create_ct_column.py"
-msgstr ""
+msgstr "Forklaringstekst tilføjet i create_ct_column.py"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:140
 msgid "Create and edit tag-based columns"
+msgstr "Opret og redigér mærkebaseret kolonne"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:19
+msgid "Text, column shown in the tag browser"
+msgstr "Tekst, kolonnen viser i mærke-browser"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:22
+msgid "Comma separated text, like tags, shown in the tag browser"
+msgstr "Kommasepareret tekst, ligesom mærker, vist i mærke-browser"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:25
+msgid "Long text, like comments, not shown in the tag browser"
+msgstr "Lang tekst, ligesom kommentarer, ikke vist i mærke-browser"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:28
+msgid "Text column for keeping series-like information"
+msgstr "Tekstkolonne til at holde serie-lignende information"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:33
+msgid "Floating point numbers"
+msgstr "Kommatal"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:35
+msgid "Integers"
+msgstr "Heltal"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:37
+msgid "Ratings, shown with stars"
+msgstr "Vurdering, vist med stjerner"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:40
+msgid "Yes/No"
+msgstr "Ja/Nej"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:64
+msgid "No column selected"
+msgstr "Ingen kolonne valgt"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:65
+msgid "No column has been selected"
+msgstr "Ingen kolonne er blevet valgt"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:69
+msgid "Selected column is not a user-defined column"
+msgstr "Valgte kolonne er ikke en brugerdefineret kolonne"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:100
+msgid "No lookup name was provided"
+msgstr "Intet søgeord blev angivet"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:102
+msgid ""
+"The label must contain only letters, digits and underscores, and start with "
+"a letter"
 msgstr ""
+"Etiketten må kun bestå af bogstaver, cifre og bundstreg - og skal begynde "
+"med et bogstav"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:111
+msgid "No column heading was provided"
+msgstr "Ingen kolonneoverskrift blev angivet"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:117
+msgid "The lookup name %s is already used"
+msgstr "Opslagsnavnet %s er allerede brugt"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:127
+msgid "The heading %s is already used"
+msgstr "Overskriften %s er allerede brugt"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:129
+msgid ""
+"The lookup name must be lower case and cannot contain \":\"s or spaces"
+msgstr ""
+"Opslagsnavnet må kun være småbogstaver og kan ikke indeholde \":\" eller "
+"mellemrum"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:117
+msgid "Create or edit custom columns"
+msgstr "Opret eller redigér tilpassede kolonner"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:102
+msgid "&Lookup name"
+msgstr "&Opslagsnavn"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:103
+msgid "Column &heading"
+msgstr "Kolonne&overskrift"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:104
+msgid ""
+"Used for searching the column. Must contain only digits and lower case "
+"letters."
+msgstr ""
+"Anvendt til at søge efter kolonne. Må kun indeholde cifre og småbogstaver."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:105
+msgid ""
+"Column heading in the library view and category name in the tag browser"
+msgstr ""
+"Kolonneoverskrift i biblioteksvisning go kategorinavn i mærke-browser"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:106
+msgid "Column &type"
+msgstr "Kolonne&type"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:107
+msgid "What kind of information will be kept in the column."
+msgstr "Hvilken slags information vil blive gemt i kolonnen."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:108
+msgid ""
+"<p>Date format. Use 1-4 'd's for day, 1-4 'M's for month, and 2 or 4 'y's "
+"for year.</p>\n"
+"<p>For example:\n"
+"<ul>\n"
+"<li> ddd, d MMM yyyy gives Mon, 5 Jan 2010<li>\n"
+"<li>dd MMMM yy gives 05 January 10</li>\n"
+"</ul> "
+msgstr ""
+"<p>Datoformat. Anvend 1-4 'd' for dag, 1-4 'M' for måned - og 2 eller 4 'y' "
+"for år.</p>\n"
+"<p>For eksempel:\n"
+"<ul>\n"
+"<li> ddd, d MMM yyyy giver Mon, 5 Jan 2010<li>\n"
+"<li>dd MMMM yy giver 05 January 10</li>\n"
+"</ul> "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:114
+msgid "Use MMM yyyy for month + year, yyyy for year only"
+msgstr "Anvend MMM yyyy for måned + år, yyyy for kun år"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:115
+msgid "Default: dd MMM yyyy."
+msgstr "Standard: dd MMM yyyy."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:116
+msgid "Format for &dates"
+msgstr "Format for &datoer"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/device_debug.py:21
 msgid "Getting debug information"
-msgstr ""
+msgstr "Få fejlfindingsinformation"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/device_debug.py:22
 msgid "Copy to &clipboard"
-msgstr ""
+msgstr "Kopiér til &udklipsholder"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/device_debug.py:24
 msgid "Debug device detection"
-msgstr ""
+msgstr "Fejlfind enhedsdetektion"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template.py:44
 msgid "Invalid template"
-msgstr ""
+msgstr "Ugyldig skabelon"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template.py:45
 msgid "The template %s is invalid:"
-msgstr ""
+msgstr "Skabelonen %s er ugyldig:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template_ui.py:42
 msgid "Save &template"
-msgstr ""
+msgstr "Gem &skabelon"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template_ui.py:43
 msgid ""
@@ -4779,65 +6299,95 @@ msgid ""
 "particular book does not have some metadata, the variable will be replaced "
 "by the empty string."
 msgstr ""
+"Ved at tilpasse nedenstående skabelon, kan du styre hvilke mapper filerne "
+"gemmes i og hvilke filnavne de får. Du kan anvende /-tegnet til at indikere "
+"undermapper. Tilgængelige metadata variable er beskrevet nedenfor. Hvis en "
+"bestemt bog ikke har nogen metadata, vil variablen blive udskiftet med den "
+"tomme streng."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/save_template_ui.py:44
 msgid "Available variables:"
-msgstr ""
+msgstr "Tilgængelige variable:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/social.py:34
 msgid "Downloading social metadata, please wait..."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
-msgid "Are you sure?"
-msgstr ""
+msgstr "Downloader sociale metadata, vent venligst..."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:50
 msgid "&Show this warning again"
-msgstr ""
+msgstr "&Vis denne advarsel igen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/conversion_error_ui.py:42
 msgid "ERROR"
-msgstr ""
+msgstr "FEJL"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:67
+msgid ""
+"All checked books will be <b>permanently deleted</b> from your device. "
+"Please verify the list."
+msgstr ""
+"Alle valgte bøger vil blive <b>permanent slettet</b> fra din enhed. Check "
+"venligst listen."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
+msgid "Location"
+msgstr "Placering"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1064
+msgid "Format"
+msgstr "Format"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device_ui.py:50
+msgid "Delete from device"
+msgstr "Slet fra enhed"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
+msgid "Author sort"
+msgstr "Forfattersortering"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog_ui.py:47
+msgid "Manage authors"
+msgstr "Administrér forfattere"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:60
 msgid "Author Sort"
 msgstr "Forfattersortering"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:62
 msgid "ISBN"
 msgstr "ISBN"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:165
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:162
 msgid "Finding metadata..."
 msgstr "Finder metadata..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:176
 msgid "Could not find metadata"
 msgstr "Kunne ikke finde metadata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:177
 msgid "The metadata download seems to have stalled. Try again later."
 msgstr ""
 "Hentningen af metadata ser ud til at være gået i stå. Prøv igen senere."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:189
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:186
 msgid "Warning"
 msgstr "Advarsel"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:190
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:187
 msgid "Could not fetch metadata from:"
 msgstr "Kunne ikke hente metadata fra:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:194
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:191
 msgid "No metadata found"
 msgstr "Ingen metadata fundet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:192
 msgid ""
 "No metadata found, try adjusting the title and author or the ISBN key."
 msgstr ""
-"Ingen metadata fundet, prøv at ændre titlen og forfatteren eller ISBN nøglen."
+"Ingen metadata fundet, prøv at ændre titlen og forfatteren eller ISBN-nøglen."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:85
 msgid "Fetch metadata"
@@ -4851,13 +6401,13 @@ msgid ""
 "below."
 msgstr ""
 "<p>calibre kan finde metadata om dine bøger to steder: <b>Google Books</b> "
-"og <b>isbndb.com</b>. <p>For at bruge isbndb.com skal du oprette <a "
-"href=\"http://www.isbndb.com\">gratis konto</a> og indtaste din adgangsnøgle "
-"nedenunder."
+"og <b>isbndb.com</b>. <p>For at bruge isbndb.com skal du oprette en <a "
+"href=\"http://www.isbndb.com\">gratis konto</a> og nedenfor indtaste din "
+"adgangsnøgle."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:87
 msgid "&Access Key:"
-msgstr "&Adgangsnøgle"
+msgstr "&Adgangsnøgle:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:88
 msgid "Fetch"
@@ -4871,15 +6421,16 @@ msgstr "Resultater"
 msgid ""
 "Select the book that most closely matches your copy from the list below"
 msgstr ""
-"Vælg den bog der passer bedst på dit eksemplar fra nedenstående liste"
+"Vælg den bog, der passer bedst på dit eksemplar, fra nedenstående liste"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:91
 msgid "Download &social metadata (tags/rating/etc.) for the selected book"
 msgstr ""
+"Download &sociale metadata (mærker/vurderinger/osv.) for den valgte bog"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:92
 msgid "Overwrite author and title with author and title of selected book"
-msgstr ""
+msgstr "Overskriv forfatter og titel med forfatter og titel fra valgte bog"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/job_view_ui.py:37
 msgid "Details of job"
@@ -4887,130 +6438,144 @@ msgstr "Detaljer for opgave"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:44
 msgid "Active Jobs"
-msgstr "Aktive Opgaver"
+msgstr "Aktive opgaver"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:45
 msgid "&Stop selected job"
-msgstr "&Stop valgte opgave"
+msgstr "&Stop valgte opgaver"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:46
 msgid "Show job &details"
-msgstr ""
+msgstr "Vis opgave&detaljer"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:47
 msgid "Stop &all jobs"
-msgstr ""
+msgstr "Stop &alle opgaver"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:22
-msgid "Editing meta information for %d books"
-msgstr ""
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:24
+msgid "Editing meta information for <b>%d books</b>"
+msgstr "Redigér metaoplysninger for <b>%d bøger</b>"
 
-#: /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:157
 msgid "Edit Meta information"
 msgstr "Rediger metaoplysninger"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:142
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:355
-msgid "Meta information"
-msgstr "Metaoplysninger"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:159
 msgid "A&utomatically set author sort"
-msgstr "Sæt forfattersortering a&utomatisk"
+msgstr "A&utomatisk forfattersortering"
 
-#: /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:160
 msgid "Author s&ort: "
-msgstr ""
+msgstr "Forfatters&ortering: "
 
-#: /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:362
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:369
 msgid ""
 "Specify how the author(s) of this book should be sorted. For example Charles "
 "Dickens should be sorted as Dickens, Charles."
 msgstr ""
-"Angiver, hvordan bogens forfatter(e) skal sorteres. Som eksempel burde "
-"Charles Dickens sorteres som Dickens, Charles."
+"Angiv hvordan bogens forfatter(e) skal sorteres. Som eksempel burde Charles "
+"Dickens sorteres som Dickens, Charles."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:147
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:162
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:372
 msgid "&Rating:"
-msgstr "&Vurdering"
+msgstr "&Vurdering:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:148
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:149
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:366
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:367
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:374
 msgid "Rating of this book. 0-5 stars"
 msgstr "Vurdering af bogen. 0-5 stjerner"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:165
 msgid "No change"
-msgstr ""
+msgstr "Ingen ændring"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:151
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:375
 msgid " stars"
 msgstr " stjerner"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:168
 msgid "Add ta&gs: "
-msgstr ""
+msgstr "Tilføj &mærker: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:155
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:156
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:372
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:170
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:379
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:380
 msgid "Open Tag Editor"
-msgstr "Åben Mærkat Editor"
+msgstr "Åben mærkat editor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:172
 msgid "&Remove tags:"
-msgstr "&Fjern mærkater"
+msgstr "&Fjern mærkater:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:173
 msgid "Comma separated list of tags to remove from the books. "
-msgstr "Kommasepareret liste over mærkater der skal fjernes fra bøgerne. "
+msgstr "Kommasepareret liste over mærkater, der skal fjernes fra bøgerne. "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:162
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:177
 msgid "Remove &format:"
 msgstr "Fjern &format"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:178
 msgid "&Swap title and author"
-msgstr ""
+msgstr "&Ombyt titel og forfatter"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:179
 msgid ""
 "Selected books will be automatically numbered,\n"
 "in the order you selected them.\n"
 "So if you selected Book A and then Book B,\n"
 "Book A will have series number 1 and Book B series number 2."
 msgstr ""
+"Valgte bøger vil automatisk blive nummererede,\n"
+"i den orden du vælger dem i.\n"
+"Så hvis du valgte Book A og derefter Book B,\n"
+"Book A vil have serienummer 1 - og Book B serienummer 2."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:168
-msgid "Automatically number books in this series"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:184
+msgid ""
+"Remove stored conversion settings for the selected books.\n"
+"\n"
+"Future conversion of these books will use the default settings."
 msgstr ""
+"Fjern gemte konverteringsindstillinger for de valgte bøger.\n"
+"\n"
+"Fremtidige konverteringer af disse bøger vil anvende standardindstillinger."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:187
+msgid "Remove &stored conversion settings for the selected books"
+msgstr "Fjern &gemte konverteringsindstillinger for de valgte bøger"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:409
+msgid "&Basic metadata"
+msgstr "&Grund metadata"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:189
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:410
+msgid "&Custom metadata"
+msgstr "&Tilpas metadata"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:123
 msgid "Not a valid picture"
-msgstr ""
+msgstr "Ikke et gyldigt billede"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:136
 msgid "Choose formats for "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1284
-msgid "Books"
-msgstr "Bøger"
+msgstr "Vælg formater for "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:165
 msgid "No permission"
-msgstr ""
+msgstr "Ingen tilladelse"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:166
 msgid "You do not have permission to read the following files:"
-msgstr ""
+msgstr "Du har ikke læseadgang til følgende filer:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:193
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:194
@@ -5040,142 +6605,156 @@ msgstr "Omslaget i %s-formatet er ugyldigt"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:298
 msgid "Abort the editing of all remaining books"
-msgstr ""
+msgstr "Afbryd redigeringen af alle resterende bøger"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:413
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:418
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:439
 msgid "This ISBN number is valid"
-msgstr ""
+msgstr "Dette ISBN-nummer er gyldigt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:442
 msgid "This ISBN number is invalid"
-msgstr ""
+msgstr "Dette ISBN-nummer er ugyldigt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:517
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:521
+msgid "Cannot use tag editor"
+msgstr "Kan ikke anvende mærkat-editor"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:522
+msgid "The tags editor cannot be used if you have modified the tags"
+msgstr "Mærkat-editor kan ikke anvendes hvis du har ændret mærkaterne"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:542
 msgid "Downloading cover..."
 msgstr "Henter omslag..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:529
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:534
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:540
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:554
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:559
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:565
 msgid "Cannot fetch cover"
 msgstr "Kan ikke hente omslag"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:530
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:541
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:566
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr "<b>Kunne ikke hente omslag</b><br/>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:556
 msgid "The download timed out."
-msgstr ""
+msgstr "Download timeout."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:560
 msgid "Could not find cover for this book. Try specifying the ISBN first."
 msgstr "Kunne ikke finde et omslag til denne bog. Prøv at angive ISBN først."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:547
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:572
 msgid "Bad cover"
 msgstr "Dårligt omslag"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:573
 msgid "The cover is not a valid picture"
 msgstr "Omslaget er ikke et gyldigt billede"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:606
 msgid "There were errors"
-msgstr ""
+msgstr "Der var fejl"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:582
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:607
 msgid "There were errors downloading social metadata"
-msgstr ""
+msgstr "Der var fejl under download af sociale metadata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:636
 msgid "Cannot fetch metadata"
 msgstr "Kan ikke hente metadata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:637
 msgid "You must specify at least one of ISBN, Title, Authors or Publisher"
-msgstr "Du skal mindst angive ISBN, Titel, Forfatter eller Forlag"
+msgstr "Du skal mindst angive ISBN, titel, forfatter eller forlag"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:681
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:708
 msgid "Permission denied"
-msgstr ""
+msgstr "Adgang nægtet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:682
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:709
 msgid "Could not open %s. Is it being used by another program?"
-msgstr ""
+msgstr "Kunne ikke åbne %s. Bliver den anvendt af et andet program?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:361
 msgid "Edit Meta Information"
-msgstr "Rediger Metadata"
+msgstr "Rediger metadata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:362
+msgid "Meta information"
+msgstr "Metaoplysninger"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:365
 msgid "Swap the author and title"
 msgstr "Ombyt forfatter og titel"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:368
 msgid "Author S&ort: "
 msgstr "Forfatters&ortering "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:370
 msgid ""
 "Automatically create the author sort entry based on the current author entry"
 msgstr ""
+"Automatisk opret forfattersorteringsindgang baseret på den aktuelle "
+"forfatterindgang"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:384
 msgid "Remove unused series (Series that have no books)"
 msgstr "Fjern ubenyttede serier (Serier uden bøger)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:379
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:386
 msgid "IS&BN:"
 msgstr "IS&BN:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:380
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:387
 msgid "Publishe&d:"
-msgstr ""
+msgstr "Ud&givet:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:390
 msgid "dd MMM yyyy"
-msgstr ""
+msgstr "dd MMM yyyy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:391
 msgid "&Date:"
-msgstr ""
+msgstr "&Dato:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:392
 msgid "&Comments"
-msgstr ""
+msgstr "&Kommentarer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:386
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:393
 msgid "&Fetch metadata from server"
 msgstr "&Hent metadata fra server"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:394
 msgid "Available Formats"
 msgstr "Tilgængelige formater"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:395
 msgid "Add a new format for this book to the database"
 msgstr "Tilføj et nyt format for denne bog til databasen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:397
 msgid "Remove the selected formats for this book from the database."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:392
-msgid "Set the cover for the book from the selected format"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:394
-msgid "Update metadata from the metadata in the selected format"
-msgstr ""
+msgstr "Fjern de valgte formater for denne bog fra databasen."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:399
-msgid "Reset cover to default"
-msgstr "Nulstil omslaget"
+msgid "Set the cover for the book from the selected format"
+msgstr "Vælg omslaget for denne bog fra det valgte format"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:401
+msgid "Update metadata from the metadata in the selected format"
+msgstr "Opdatér metadata fra metadata i det valgte format"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:406
+msgid "Reset cover to default"
+msgstr "Nulstil til standardomslag"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:408
 msgid "Download &cover"
 msgstr "Hent &omslag"
 
@@ -5187,50 +6766,86 @@ msgstr "Adgangskode påkrævet"
 msgid "Aborting..."
 msgstr "Afbryder..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:120
-msgid "Need username and password"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor.py:54
+msgid ""
+"The current saved search will be <b>permanently deleted</b>. Are you sure?"
 msgstr ""
+"Den aktuelt gemte søgning vil blive <b>permanent slettet</b>. Er du sikker?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:83
+msgid "Saved Search Editor"
+msgstr "Gemt søgnings-editor"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:84
+msgid "Saved Search: "
+msgstr "Gemt søgning: "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:85
+msgid "Select a saved search to edit"
+msgstr "Vælg en gemt søgning til redigering"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:86
+msgid "Delete this selected saved search"
+msgstr "Slet den valgte gemte søgning"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:88
+msgid "Enter a new saved search name."
+msgstr "Indtast et nyt gemt søgenavn."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:89
+msgid "Add the new saved search"
+msgstr "Tilføj den nye gemte søgning"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:91
+msgid "Change the contents of the saved search"
+msgstr "Ændre indholdet af den gemte søgning"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:119
+msgid "Need username and password"
+msgstr "Behøver brugernavn og adgangskode"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:120
 msgid "You must provide a username and/or password to use this news source."
 msgstr ""
+"Du skal angive et brugernavn og/eller adgangskode for at anvende denne "
+"nyhedskilde."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:171
 msgid "Created by: "
 msgstr "Lavet af: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:178
 msgid "Last downloaded: never"
 msgstr "Sidst hentet: Aldrig"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:194
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:193
 msgid "%d days, %d hours and %d minutes ago"
 msgstr "%d dage, %d timer og %d minutter siden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:195
 msgid "Last downloaded"
 msgstr "Sidst hentet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:217
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:216
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:192
 msgid "Schedule news download"
 msgstr "Planlæg hentning af nyheder"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:220
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:219
 msgid "Add a custom news source"
 msgstr "Tilføj en brugerdefineret nyhedskilde"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:224
 msgid "Download all scheduled new sources"
-msgstr ""
+msgstr "Download alle planlagte nyhedskilder"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:321
+msgid "No internet connection"
+msgstr "Ingen internetforbindelse"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:322
-msgid "No internet connection"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:323
 msgid "Cannot download news as no internet connection is active"
-msgstr ""
+msgstr "Kan ikke downloade nyheder, da ingen internetforbindelse er aktiv"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:193
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:278
@@ -5239,24 +6854,24 @@ msgstr "Opskrifter"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:194
 msgid "Download all scheduled recipes at once"
-msgstr ""
+msgstr "Download alle planlagte opskrifter på én gang"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:195
 msgid "Download &all scheduled"
-msgstr ""
+msgstr "Download &alle planlagte"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:196
 msgid "blurb"
-msgstr ""
+msgstr "Kort opsummering"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:197
 msgid "&Schedule for download:"
-msgstr ""
+msgstr "&Planlagt for download:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:198
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:208
 msgid "Every "
-msgstr ""
+msgstr "Hvert "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:199
 msgid "day"
@@ -5292,120 +6907,127 @@ msgstr "Søndag"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:207
 msgid "at"
-msgstr ""
+msgstr "ved"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:209
 msgid ""
 "Interval at which to download this recipe. A value of zero means that the "
 "recipe will be downloaded every hour."
 msgstr ""
+"Interval ved hvilken denne opskrift skal downloade. En værdi på nul betyder "
+"at opskriften vil downloade hver time."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:210
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:222
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:263
 msgid " days"
-msgstr ""
+msgstr " dage"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:211
 msgid "&Account"
-msgstr ""
+msgstr "&Konto"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:215
 msgid "For the scheduling to work, you must leave calibre running."
-msgstr ""
+msgstr "For at det planlagte skal virke, skal du lade calibre køre."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:216
 msgid "&Schedule"
-msgstr ""
+msgstr "&Planlæg"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:217
 msgid "Add &title as tag"
-msgstr ""
+msgstr "Tilføj &titel som mærkat"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:218
 msgid "&Extra  tags:"
-msgstr ""
+msgstr "&Ekstra mærkater:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:219
 msgid "&Advanced"
-msgstr ""
+msgstr "&Avanceret"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:220
 msgid "&Download now"
-msgstr ""
+msgstr "&Download nu"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:221
 msgid ""
 "Delete downloaded news older than the specified number of days. Set to zero "
 "to disable."
 msgstr ""
+"Slet downloadede nyheder ældre end det opgivne antal dage. Sæt til nul for "
+"at deaktivere."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:223
 msgid "Delete downloaded news older than "
-msgstr ""
+msgstr "SLet downloadede nyheder ældre end "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:36
 msgid "contains"
-msgstr ""
+msgstr "indeholder"
 
 #: /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 "Teksten der søges efter. Den fortolkes som et regulært udtryk."
 
 #: /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>Negér denne match. Det betyder, returnér kun resultater som <b>ikke</b> "
+"matcher denne forespørgsel."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:39
 msgid "Negate"
-msgstr ""
+msgstr "Negér"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:113
 msgid "Advanced Search"
-msgstr ""
+msgstr "Avanceret søgning"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:114
 msgid "Find entries that have..."
-msgstr ""
+msgstr "Find indgange der har..."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:115
 msgid "&All these words:"
-msgstr ""
+msgstr "&alle disse ord:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:116
 msgid "This exact &phrase:"
-msgstr ""
+msgstr "Den eksakte &frase:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:117
 msgid "&One or more of these words:"
-msgstr ""
+msgstr "&En eller flere af disse ord:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:118
 msgid "But dont show entries that have..."
-msgstr ""
+msgstr "men vis ikke indgange der har..."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:119
 msgid "Any of these &unwanted words:"
-msgstr ""
+msgstr "nogen af disse &uønskede ord:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:120
 msgid "What kind of match to use:"
-msgstr ""
+msgstr "Hvilken slags match skal anvendes:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:121
 msgid "Contains: the word or phrase matches anywhere in the metadata"
 msgstr ""
+"Indeholder: Ordet eller frasen vil forsøges matchet overalt i metadataene"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:122
 msgid "Equals: the word or phrase must match an entire metadata field"
-msgstr ""
+msgstr "Lig: Ordet eller frasen skal matche et helt metadata felt"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:123
 msgid ""
 "Regular expression: the expression must match anywhere in the metadata"
-msgstr ""
+msgstr "Regulært udtryk: Udtrykket forsøges matchet overalt i metadataene"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:124
 msgid " "
@@ -5416,60 +7038,197 @@ msgid ""
 "See the <a href=\"http://calibre-ebook.com/user_manual/gui.html#the-search-"
 "interface\">User Manual</a> for more help"
 msgstr ""
+"Se <a href=\"http://calibre-ebook.com/user_manual/gui.html#the-search-"
+"interface\">brugermanual</a> for mere hjælp"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/select_formats.py:45
 msgid "Choose formats"
-msgstr ""
+msgstr "Vælg formater"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:76
+msgid "Authors"
+msgstr "Forfattere"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:107
+msgid "Publishers"
+msgstr "Forlag"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:110
+msgid " (not on any book)"
+msgstr " (ikke i nogen bøger)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:162
+msgid ""
+"The current tag category will be <b>permanently deleted</b>. Are you sure?"
+msgstr ""
+"Den aktuelle mærkat kategori vil blive <b>permanent slettet</b>. Er du "
+"sikker?"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:153
+msgid "User Categories Editor"
+msgstr "Brugerkategori-editor"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:154
+msgid "A&vailable items"
+msgstr "T&ilgængelige genstande"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:155
+msgid "Apply tags to current tag category"
+msgstr "Påfør mærkater på aktuelle mærkatkategori"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:157
+msgid "A&pplied items"
+msgstr "A&nvendte genstande"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:158
+msgid "Unapply (remove) tag from current tag category"
+msgstr "Påføringsannullering (fjerne) mærkat på aktuelle mærkatkategori"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:160
+msgid "Category name: "
+msgstr "Kategorinavn: "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:161
+msgid "Select a category to edit"
+msgstr "Vælg en kategori der skal redigeres"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:162
+msgid "Delete this selected tag category"
+msgstr "Slet den valgte mærkatkategori"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:164
+msgid "Enter a new category name. Select the kind before adding it."
+msgstr "Indtast et nyt kategorinavn. Vælg typen før tilføjning af den."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:165
+msgid "Add the new category"
+msgstr "Tilføj den nye kategori"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:167
+msgid "Category filter: "
+msgstr "Kategori filter: "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:168
+msgid "Select the content kind of the new category"
+msgstr "Vælg indholdstypen af den nye kategori"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:101
 msgid "Are your sure?"
-msgstr ""
+msgstr "Er du sikker?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor.py:67
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor.py:69
 msgid ""
 "The following tags are used by one or more books. Are you certain you want "
 "to delete them?"
 msgstr ""
+"De følgende mærkater bliver anvendt af en eller flere bøger. Er du sikker på "
+"at du vil slette dem?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:123
 msgid "Tag Editor"
-msgstr ""
+msgstr "Mærke-editor"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:124
 msgid "A&vailable tags"
-msgstr ""
+msgstr "T&ilgængelige mærkater"
 
 #: /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 ""
+"Slet mærkat fra database. Dette vil fjerne mærkatet fra alle bøger og "
+"herefter fjerne den fra databasen."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:127
 msgid "Apply tag to current book"
-msgstr ""
+msgstr "Anvend mærkat på den aktuelle bog"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:129
 msgid "A&pplied tags"
-msgstr ""
+msgstr "A&nvendte mærkater"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:130
 msgid "Unapply (remove) tag from current book"
-msgstr ""
+msgstr "Fjern mærkat fra den aktuelle bog"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:132
 msgid "&Add tag:"
-msgstr ""
+msgstr "&Tilføj mærkat:"
 
 #: /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 ""
+"Hvis mærkaten du ønsker ikke er i den tilgængelige liste, kan du tilføje den "
+"her. Accepterer en kommasepareret liste af mærkater."
 
 #: /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 ""
+"Tilføj mærkat til tilgængelige mærkater og anvend den på den aktuelle bog"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:20
+msgid "%s (was %s)"
+msgstr "%s (var %s)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:501
+msgid "Item is blank"
+msgstr "Emne er blankt"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:502
+msgid "An item cannot be set to nothing. Delete it instead."
+msgstr "Et emne kan ikke sættes til ingenting. Slet det istedet."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:87
+msgid "No item selected"
+msgstr "Intet emne valgt"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:88
+msgid "You must select one item from the list of Available items."
+msgstr "Du skal vælge et emne fra listen af tilgængelige emner."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:97
+msgid "No items selected"
+msgstr "Ingen emner valgt"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:98
+msgid "You must select at least one items from the list."
+msgstr "Du skal vælge mindst et emne fra listen."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:102
+msgid "Are you certain you want to delete the following items?"
+msgstr "Er du sikker på at du ønsker at slette følgende emner?"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:72
+msgid "Category Editor"
+msgstr "Kategoriredigering"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:73
+msgid "Items in use"
+msgstr "Emner i brug"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:74
+msgid ""
+"Delete item from database. This will unapply the item from all books and "
+"then remove it from the database."
+msgstr ""
+"Slet emne fra database. Dette vil fjerne emnet fra alle bøger og herefter "
+"slette det fra databasen."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:76
+msgid "Rename the item in every book where it is used."
+msgstr "Omdøb emnet i bøger hvor det er brugt."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:78
+msgid "Ctrl+S"
+msgstr "Ctrl+S"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:51
 msgid "Test email settings"
@@ -5490,7 +7249,7 @@ msgstr "Ingen opskrift valgt"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:132
 msgid "The attached file: %s is a recipe to download %s."
-msgstr ""
+msgstr "Bilagsfilen: %s er en opskrift der kan downloades %s."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:133
 msgid "Recipe for "
@@ -5500,28 +7259,28 @@ msgstr "Opskrift for "
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:161
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:255
 msgid "Switch to Advanced mode"
-msgstr ""
+msgstr "Skift til avanceret tilstand"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:156
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:164
 msgid "Switch to Basic mode"
-msgstr ""
+msgstr "Skift til grundtilstand"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:174
 msgid "Feed must have a title"
-msgstr ""
+msgstr "Feed skal have en titel"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:175
 msgid "The feed must have a title"
-msgstr ""
+msgstr "Feeden skal have en titel"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:179
 msgid "Feed must have a URL"
-msgstr ""
+msgstr "Feed skal have en URL"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:180
 msgid "The feed %s must have a URL"
-msgstr ""
+msgstr "Feeden %s skal have en URL"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:185
 msgid "Already exists"
@@ -5529,71 +7288,73 @@ msgstr "Eksisterer allerede"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:186
 msgid "This feed has already been added to the recipe"
-msgstr ""
+msgstr "Denne feed er allerede blevet tilføjet til opskriften"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:227
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:236
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:286
 msgid "Invalid input"
-msgstr ""
+msgstr "Ugyldigt input"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:228
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:237
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:287
 msgid "<p>Could not create recipe. Error:<br>%s"
-msgstr ""
+msgstr "<p>Kunne ikke oprette opskrift. Fejl:<br>%s"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:241
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:263
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:290
 msgid "Replace recipe?"
-msgstr ""
+msgstr "Erstat opskrift?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:242
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:264
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:291
 msgid "A custom recipe named %s already exists. Do you want to replace it?"
 msgstr ""
+"En bruger opskrift med navn %s eksisterer allerede. Ønsker du at overskrive "
+"den?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:257
 msgid "Pick recipe"
-msgstr ""
+msgstr "Vælg overskrift"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:257
 msgid "Pick the recipe to customize"
-msgstr ""
+msgstr "Vælg overskrift der skal tilpasses"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:277
 msgid "Choose a recipe file"
-msgstr ""
+msgstr "Vælg en en opskriftsfil"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:248
 msgid "Add custom news source"
-msgstr ""
+msgstr "Tilføj bruger nyhedskilde"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:249
 msgid "Available user recipes"
-msgstr ""
+msgstr "Tilgængelige brugeropskrifter"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:250
 msgid "Add/Update &recipe"
-msgstr ""
+msgstr "Tilføj/opdater &opskrift"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:251
 msgid "&Remove recipe"
-msgstr ""
+msgstr "&Fjern opskrift"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:252
 msgid "&Share recipe"
-msgstr ""
+msgstr "&Del opskrift"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:253
 msgid "Customize &builtin recipe"
-msgstr ""
+msgstr "Brugertilpas &indbygget opskrift"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:254
 msgid "&Load recipe from file"
-msgstr ""
+msgstr "&Hent opskrift fra fil"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:256
 msgid ""
@@ -5608,61 +7369,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;\">Opret en grund "
+"nyhedsopskrift ved at tilføje RSS-feeds til den. <br />For de fleste feeds, "
+"bliver du nødt til at anvende \"avanceret tilstand\" for yderligere "
+"tilpasning af henteprocessen.</p></body></html>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:260
 msgid "Recipe &title:"
-msgstr ""
+msgstr "Opskrift&titel:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:261
 msgid "&Oldest article:"
-msgstr ""
+msgstr "&Ældste artikel:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:262
 msgid "The oldest article to download"
-msgstr ""
+msgstr "Den ældste artikel der skal downloades"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:264
 msgid "&Max. number of articles per feed:"
-msgstr ""
+msgstr "&Maksimalt antal artikler per feed:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:265
 msgid "Maximum number of articles to download per feed."
-msgstr ""
+msgstr "Maksimum antal artikler at downloade per feed."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:266
 msgid "Feeds in recipe"
-msgstr ""
+msgstr "Feeds i opskrift"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:268
 msgid "Remove feed from recipe"
-msgstr ""
+msgstr "Fjern feed fra opskrift"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:271
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:274
 msgid "Add feed to recipe"
-msgstr ""
+msgstr "Tilføj feed til opskrift"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:272
 msgid "&Feed title:"
-msgstr ""
+msgstr "&Feed titel:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:273
 msgid "Feed &URL:"
-msgstr ""
+msgstr "Feed-&URL:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:275
 msgid "&Add feed"
-msgstr ""
+msgstr "&Tilføj feed"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:276
 msgid ""
 "For help with writing advanced news recipes, please visit <a "
 "href=\"http://calibre.kovidgoyal.net/user_manual/news.html\">User Recipes</a>"
 msgstr ""
+"For hjælp med at skrive avancerede nyhedsopskrifter, venligst besøg <a "
+"href=\"http://calibre.kovidgoyal.net/user_manual/news.html\">brugeropskrifter"
+"</a>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:277
 msgid "Recipe source code (python)"
-msgstr ""
+msgstr "Opskriftskildekode (python)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:107
 msgid ""
@@ -5687,642 +7461,1083 @@ msgid ""
 "expression on a few sample filenames. The group names for the various "
 "metadata entries are documented in tooltips.</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:'Candara'; 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;\">Sæt et regulært "
+"udtryksmønster anvendt til at gætte e-bogsmetadata fra filnavne. </p>\n"
+"<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">En <a "
+"href=\"http://docs.python.org/lib/re-syntax.html\"><span style=\" text-"
+"decoration: underline; color:#0000ff;\">reference</span></a> på regulære "
+"udtryks syntaks er tilgængelig.</p>\n"
+"<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">Brug <span style=\" font-"
+"weight:600;\">test</span> funktionaliteten nedenfor til at teste dine "
+"regulære udtryk på et par eksempel filnavne.  Gruppenavnene for de "
+"forskellige metadata indgange er dokumenteret i tooltips.</p></body></html>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
 msgid "Regular &expression"
-msgstr ""
+msgstr "Regulært &udtryk"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:116
 msgid "File &name:"
-msgstr ""
+msgstr "Fil&navn:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:118
 msgid "Title:"
-msgstr ""
+msgstr "Titel:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
 msgid "Regular expression (?P&lt;title&gt;)"
-msgstr ""
+msgstr "Regulært udtryk (?P&lt;title&gt;)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:82
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:83
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:87
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:99
 msgid "No match"
-msgstr ""
+msgstr "Ingen fund"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
 msgid "Authors:"
-msgstr ""
+msgstr "Forfattere:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
 msgid "Regular expression (?P<author>)"
-msgstr ""
+msgstr "Regulært udtryk (?P<author>)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
 msgid "Series:"
-msgstr ""
+msgstr "Serier:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
 msgid "Regular expression (?P<series>)"
-msgstr ""
+msgstr "Regulært udtryk (?P<series>)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127
 msgid "Series index:"
-msgstr ""
+msgstr "Serieindeks:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128
 msgid "Regular expression (?P<series_index>)"
-msgstr ""
+msgstr "Regulært udtryk (?P<series_index>)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130
 msgid "ISBN:"
-msgstr ""
+msgstr "ISBN:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131
 msgid "Regular expression (?P<isbn>)"
-msgstr ""
+msgstr "Regulært udtryk (?P<isbn>)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:36
+msgid "Save single format to disk..."
+msgstr "Gem enkelt format til disk..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:53
+msgid "Edit metadata individually"
+msgstr "Redigér metadata individuelt"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:56
+msgid "Edit metadata in bulk"
+msgstr "Redigér metadata som klynge"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:59
+msgid "Download metadata and covers"
+msgstr "Download metadata og omslag"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:62
+msgid "Download only metadata"
+msgstr "Download kun metadata"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:64
+msgid "Download only covers"
+msgstr "Download kun omslag"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:67
+msgid "Download only social metadata"
+msgstr "Download kun sociale metadata"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:73
+msgid "Merge into first selected book - delete others"
+msgstr "Flet ind i den først valgte bog - slet andre"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:76
+msgid "Merge into first selected book - keep others"
+msgstr "Flet ind i den først valgte bog - slet andre"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:84
+msgid "Add books from a single directory"
+msgstr "Tilføj bøger fra én enkelt mappe"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:86
+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 ""
+"Tilføj bøger fra mapper, inklusiv undermapper (Én e-bog per mappe, formoder "
+"hver e-bogsfil er den samme e-bog i forskellge formater)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:90
+msgid ""
+"Add books from directories, including sub directories (Multiple books per "
+"directory, assumes every ebook file is a different book)"
+msgstr ""
+"Tilføj bøger fra mapper, inklusiv undermapper (Flere e-bøger per mappe, "
+"formoder hver e-bogsfil er en distinkt e-bog)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:93
+msgid "Add Empty book. (Book entry with no formats)"
+msgstr "Tilføj tom e-bog. (Bogindgange uden formater)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:160
+msgid "Save to disk"
+msgstr "Gem på disk"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
+msgid "Save to disk in a single directory"
+msgstr "Gem på disk i en enkelt mappe"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:393
+msgid "Save only %s format to disk"
+msgstr "Gem kun %s format på disk"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:396
+msgid "Save only %s format to disk in a single directory"
+msgstr "Gem kun %s format på disk i en enkelt mappe"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:166
+msgid "View"
+msgstr "Vis"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:121
+msgid "View specific format"
+msgstr "Vis specifikt format"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:127
+msgid "Remove selected books"
+msgstr "Fjern valgte bøger"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:129
+msgid "Remove files of a specific format from selected books.."
+msgstr "Fjern file med et specifikt format fra valgte bøger.."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:132
+msgid "Remove all formats from selected books, except..."
+msgstr "Fjern alle formater fra valgte bøger, undtagen..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:135
+msgid "Remove covers from selected books"
+msgstr "Fjern omslag fra valgte bøger"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:138
+msgid "Remove matching books from device"
+msgstr "Fjern matchende bøger fra enhed"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:155
+msgid "Convert individually"
+msgstr "Konvertér individuelt"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:157
+msgid "Bulk convert"
+msgstr "Klynge konvertering"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:161
+msgid "Create catalog of books in your calibre library"
+msgstr "Opret bogkatalog i dit calibre bibliotek"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:169
+msgid "Run welcome wizard"
+msgstr "Kør velkommen guide"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:191
+msgid "Similar books..."
+msgstr "Lignende bøger..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:223
+msgid "Add books to library"
+msgstr "Tilføj bøger til bibliotek"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:239
+msgid "Manage collections"
+msgstr "Administrér collections"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:319
+msgid "Cover Browser"
+msgstr "Omslags-browser"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:337
+msgid "Tag Browser"
+msgstr "Mærkat-browser"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:358
+msgid "version"
+msgstr "version"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:359
+msgid "created by Kovid Goyal"
+msgstr "skabt af Kovid Goyal"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:377
+msgid "Connected "
+msgstr "Forbundet "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:386
+msgid "Update found"
+msgstr "Opdatering fundet"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:430
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:439
+msgid "Book Details"
+msgstr "Bog detaljer"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:60
 msgid "Job"
 msgstr "Opgave"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:61
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:62
 msgid "Progress"
-msgstr ""
+msgstr "Status"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:63
 msgid "Running time"
-msgstr ""
+msgstr "Kørselstid"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:75
 msgid "There are %d running jobs:"
-msgstr ""
+msgstr "Der er %d kørende opgaver:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:79
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:86
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:101
 msgid "Unknown job"
 msgstr "Ukendt opgave"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:82
 msgid "There are %d waiting jobs:"
-msgstr ""
+msgstr "Der er %d ventende opgaver:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:211
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:216
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:219
 msgid "Cannot kill job"
 msgstr "Kan ikke stoppe opgave"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:217
 msgid "Cannot kill jobs that communicate with the device"
-msgstr "Kan ikke stoppe opgaver der kommunikerer med enheden"
+msgstr "Kan ikke stoppe opgaver, der kommunikerer med enheden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:215
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:220
 msgid "Job has already run"
 msgstr "Opgaven er allerede udført"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:243
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:248
 msgid "Unavailable"
 msgstr "Utilgængelig"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:280
+msgid "Jobs:"
+msgstr "Opgaver:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:298
+msgid "Click to see list of active jobs."
+msgstr "Klik for at se en liste over aktive opgaver."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:358
 msgid " - Jobs"
 msgstr " - Opgaver"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:176
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1161
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:64
+msgid ""
+"Library\n"
+"%d books"
+msgstr ""
+"Bibliotek\n"
+"%d bøger"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:65
+msgid ""
+"Reader\n"
+"%s"
+msgstr ""
+"Læser\n"
+"%s"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:66
+msgid ""
+"Card A\n"
+"%s"
+msgstr ""
+"Kort A\n"
+"%s"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:67
+msgid ""
+"Card B\n"
+"%s"
+msgstr ""
+"Kort B\n"
+"%s"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:71
+msgid "Click to see the books available on your computer"
+msgstr "Tryk for at se tilgængelige bøger på din computer"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:74
+msgid "Click to see the books in the main memory of your reader"
+msgstr "Tryk for at se bøgerne i enhedens arbejdshukommelse"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:75
+msgid "Click to see the books on storage card A in your reader"
+msgstr "Tryk for at se bøgerne på hukommelseskort A i din læser"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:76
+msgid "Click to see the books on storage card B in your reader"
+msgstr "Tryk for at se bøgerne på hukommelseskort B i din læser"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:84
+msgid "Books located at"
+msgstr "Bøger placeret ved"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:100
+msgid "free"
+msgstr "ledig"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:134
+msgid ""
+"Books display will be restricted to those matching the selected saved search"
+msgstr ""
+"Bøger vist vil blive begrænset til disse der matcher de valgte gemte "
+"søgninger"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:136
+msgid "Advanced search"
+msgstr "Avanceret søgning"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:141
+msgid ""
+"<p>Search the list of books by title, author, publisher, tags, comments, "
+"etc.<br><br>Words separated by spaces are ANDed"
+msgstr ""
+"<p>Søg i listen af bøger efter titel, forfatter, forlag, mærkater, "
+"kommentarer, osv.<br><br>Ord separeres af mellemrum bliver ANDed"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:142
+msgid "Reset Quick Search"
+msgstr "Nulstil hurtigsøgning"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:328
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:144
+msgid "Copy current search text (instead of search name)"
+msgstr "Kopiér aktuelle søgetekst (istedet for søgenavnet)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:146
+msgid "Save current search under the name shown in the box"
+msgstr "Gem aktuel søgning under navnet vist i boksen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:148
+msgid "Delete current saved search"
+msgstr "Slet aktuelt gemte søgning"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:150
+msgid "Add books"
+msgstr "Tilføj bøger"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:151
+msgid "A"
+msgstr "A"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:153
+msgid "Remove books"
+msgstr "Fjern bøger"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:154
+msgid "Del"
+msgstr "Slet"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:406
+msgid "Edit meta info"
+msgstr "Redigér meta info"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:406
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:156
+msgid "E"
+msgstr "E"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:157
+msgid "Merge book records"
+msgstr "Flet bogposter"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:158
+msgid "M"
+msgstr "M"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:159
+msgid "Send to device"
+msgstr "Send til enhed"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:161
+msgid "S"
+msgstr "S"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:162
+msgid "Fetch news"
+msgstr "Hent nyheder"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:163
+msgid "F"
+msgstr "F"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:164
+msgid "Convert books"
+msgstr "Konvertér bøger"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:165
+msgid "C"
+msgstr "C"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:167
+msgid "V"
+msgstr "V"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:168
+msgid "Open containing folder"
+msgstr "Åben mappe herover"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:169
+msgid "Show book details"
+msgstr "Vis bogdetaljer"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:170
+msgid "Books by same author"
+msgstr "Bøger af samme forfatter"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:171
+msgid "Books in this series"
+msgstr "Bøger i denne serie"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:172
+msgid "Books by this publisher"
+msgstr "Bøger fra dette forlag"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:173
+msgid "Books with the same tags"
+msgstr "Bøger med samme mærkater"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:176
+msgid "Ctrl+P"
+msgstr "Ctrl+P"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:177
+msgid "Help"
+msgstr "Hjælp"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:178
+msgid "Browse the calibre User Manual"
+msgstr "Browse calibre brugermanualen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:179
+msgid "F1"
+msgstr "F1"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:284
+msgid "N"
+msgstr "N"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:284
+msgid "Y"
+msgstr "Y"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
+msgid "On Device"
+msgstr "På enhed"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
 msgid "Size (MB)"
-msgstr ""
+msgstr "Størrelse (MB)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Rating"
-msgstr ""
+msgstr "Vurdering"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:365
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:371
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:376
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
-#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:440
-msgid "None"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:324
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1084
 msgid "Book <font face=\"serif\">%s</font> of %s."
-msgstr ""
+msgstr "Bog <font face=\"serif\">%s</font> af %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:899
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1182
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
+msgid "The lookup/search name is \"{0}\""
+msgstr "Opslaget/søgenavn er \"{0}\""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:886
+msgid "In Library"
+msgstr "I bibliotek"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:890
+msgid "Size"
+msgstr "Størrelse"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1162
+msgid "Marked for deletion"
+msgstr "Markeret til sletning"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1165
+msgid "Double click to <b>edit</b> me<br><br>"
+msgstr "Dobbeltklik for at <b>redigere</b> mig<br><br>"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
+msgid "Hide column %s"
+msgstr "Gem kolonne %s"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:115
+msgid "Sort on %s"
+msgstr "Sortér efter %s"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:116
+msgid "Ascending"
+msgstr "Stigende"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:119
+msgid "Descending"
+msgstr "Faldende"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:131
+msgid "Change text alignment for %s"
+msgstr "Ændre tekstjustering for %s"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:133
+msgid "Left"
+msgstr "Venstre"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:133
+msgid "Right"
+msgstr "Højre"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:134
+msgid "Center"
+msgstr "Centrér"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:153
+msgid "Show column"
+msgstr "Vis kolonne"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:165
+msgid "Restore default layout"
+msgstr "Gendan standard layout"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:525
 msgid "Not allowed"
-msgstr ""
+msgstr "Ikke tilladt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:900
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:526
 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:1100
-msgid "Format"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:1151
-msgid "Double click to <b>edit</b> me<br><br>"
-msgstr ""
+"Droppe på en enhed er ikke understøttet. Tilføj først bogen til calibre "
+"biblioteket."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:47
 msgid "Configure Viewer"
-msgstr ""
+msgstr "Konfigurér viser"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:48
 msgid "Use white background"
-msgstr ""
+msgstr "Anvend hvid baggrund"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:49
 msgid "Hyphenate"
-msgstr ""
+msgstr "Orddeling"
 
 #: /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>Ændringer vil først træde i kraft efter genstart.</b>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:70
 msgid " - LRF Viewer"
-msgstr ""
+msgstr " - LRF-viser"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
 msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
-msgstr ""
+msgstr "<b>Ingen match</b> for denne søgefrase <i>%s</i> blev fundet."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:440
 msgid "No matches found"
-msgstr ""
+msgstr "Ingen søgeresultater fundet"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:128
 msgid "LRF Viewer"
-msgstr ""
+msgstr "LRF-viser"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:129
 msgid "Parsing LRF file"
-msgstr ""
+msgstr "Parser LRF-fil"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:130
 msgid "LRF Viewer toolbar"
-msgstr ""
+msgstr "LRF-viser værktøjslinje"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:476
 msgid "Next Page"
-msgstr ""
+msgstr "Næste side"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:477
 msgid "Previous Page"
-msgstr ""
+msgstr "Forrige side"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:133
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:188
 msgid "Back"
-msgstr ""
+msgstr "Tilbage"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:134
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:189
 msgid "Forward"
-msgstr ""
+msgstr "Frem"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:135
 msgid "Next match"
-msgstr ""
+msgstr "Næste match"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:136
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:196
 msgid "Open ebook"
-msgstr ""
+msgstr "Åben e-bog"
 
 #: /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:28
-msgid "Use the library located at the specified path."
-msgstr ""
+msgstr "Konfigurér"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:30
-msgid "Start minimized to system tray."
-msgstr ""
+msgid "Use the library located at the specified path."
+msgstr "Anvend biblioteket placeret på den specificerede sti."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:32
-msgid "Log debugging information to console"
-msgstr ""
+msgid "Start minimized to system tray."
+msgstr "Start minimeret til systembakken."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:34
+msgid "Log debugging information to console"
+msgstr "Log fejlfindingsinformation til konsol"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:36
 msgid "Do not check for updates"
-msgstr ""
+msgstr "Check ikke efter opdateringer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:65
-msgid "Choose a location for your calibre e-book library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:74
-msgid "Failed to create library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:75
-msgid "Failed to create calibre library at: %r. Aborting."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:145
-msgid "Repairing failed"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:146
-msgid "The database repair failed. Starting with a new empty library."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:150
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:594
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:595
 msgid "Calibre Library"
-msgstr ""
+msgstr "Calibre bibliotek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:86
+msgid "Choose a location for your calibre e-book library"
+msgstr "Vælg en placering til dit calibre e-bogsbibliotek"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:95
+msgid "Failed to create library"
+msgstr "Biblioteksoprettelse fejlede"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:96
+msgid "Failed to create calibre library at: %r."
+msgstr "Oprettelse af calibre bibliotek fejlede ved: %r."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:184
 msgid "Choose a location for your new calibre e-book library"
-msgstr ""
+msgstr "Vlæg en placering til dit nye calibre e-bogsbibliotek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:173
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:206
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:153
+msgid "Initializing user interface..."
+msgstr "Initialiserer brugergrænseflade..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:178
+msgid "Repairing failed"
+msgstr "Udbedring fejlede"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:179
+msgid "The database repair failed. Starting with a new empty library."
+msgstr "Databaseudbedring fejlede. Starter med et nyt tomt bibliotek."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:193
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:226
 msgid "Bad database location"
-msgstr ""
+msgstr "Uegnet databaseplacering"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:194
 msgid "Bad database location %r. calibre will now quit."
-msgstr ""
+msgstr "Uegnet databaseplacering %r. calibre vil nu slutte."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:187
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:207
 msgid "Corrupted database"
-msgstr ""
+msgstr "Ødelagt database"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:188
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:208
 msgid ""
 "Your calibre database appears to be corrupted. Do you want calibre to try "
 "and repair it automatically? If you say No, a new empty calibre library will "
 "be created."
 msgstr ""
+"Din calibre database ser ud til at være ødelagt. Vil du lade calibre prøve "
+"på at udbedre den automatisk? Hvis du siger nej, vil et nyt tomt bibliotek "
+"blive oprettet."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:194
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:214
 msgid ""
 "Repairing database. This can take a very long time for a large collection"
 msgstr ""
+"Udbedrer database. Dette kan tage meget lang tid for store bogsamlinger"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:227
 msgid ""
 "Bad database location %r. Will start with  a new, empty calibre library"
 msgstr ""
+"Uegnet databaseplacering %r. Vil starte med en nyt tomt calibre bibliotek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:250
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:238
+msgid "Starting %s: Loading books..."
+msgstr "Starter %s: Henter bøger..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:283
 msgid "If you are sure it is not running"
-msgstr ""
+msgstr "Hvis du ikke er sikker på den kører"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:252
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:285
 msgid "Cannot Start "
-msgstr ""
+msgstr "Kan ikke starte "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:286
 msgid "%s is already running."
-msgstr ""
+msgstr "%s kører allerede."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:256
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:289
 msgid "may be running in the system tray, in the"
-msgstr ""
+msgstr "kører muligvis i systembakken, i"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:258
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:291
 msgid "upper right region of the screen."
-msgstr ""
+msgstr "øvre højre område af skærmen."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:293
 msgid "lower right region of the screen."
-msgstr ""
+msgstr "nedre højre område af skærmen."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:296
 msgid "try rebooting your computer."
-msgstr ""
+msgstr "prøv at genstarte din computer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:265
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:310
 msgid "try deleting the file"
-msgstr ""
+msgstr "prøv at slette filen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:131
 msgid "calibre"
-msgstr ""
+msgstr "calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:366
-msgid "Advanced search"
-msgstr ""
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:133
+msgid "&Restrict to:"
+msgstr "&Begræns til:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:368
-msgid "Alt+S"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:369
-msgid "&Search:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:370
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:371
-msgid ""
-"<p>Search the list of books by title, author, publisher, tags, comments, "
-"etc.<br><br>Words separated by spaces are ANDed"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:135
 msgid "set in ui.py"
-msgstr ""
+msgstr "sæt i ui.py"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:373
-msgid "Reset Quick Search"
-msgstr ""
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:138
+msgid "Alt+S"
+msgstr "Alt+S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:375
-msgid "Choose saved search or enter name for new saved search"
-msgstr ""
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:139
+msgid "&Search:"
+msgstr "&Søg:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:376
-msgid "Copy current search text (instead of search name)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:378
-msgid "Save current search under the name shown in the box"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:380
-msgid "Delete current saved search"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:382
-msgid "Sort by &popularity"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:383
-msgid "Match any"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:384
-msgid "Match all"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:385
-msgid "Add books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:386
-msgid "A"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:387
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:388
-msgid "Remove books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:389
-msgid "Del"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:155
 msgid "Edit meta information"
-msgstr ""
+msgstr "Redigér metaoplyninger"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:391
-msgid "E"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:392
-msgid "Merge books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:393
-msgid "M"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:394
-msgid "Send to device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:395
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:347
-msgid "Save to disk"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:396
-msgid "S"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:397
-msgid "Fetch news"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:398
-msgid "F"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:399
-msgid "Convert E-books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:400
-msgid "C"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:401
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:357
-msgid "View"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:402
-msgid "V"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:403
-msgid "Open containing folder"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:404
-msgid "Show book details"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:405
-msgid "Books by same author"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:406
-msgid "Books in this series"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:407
-msgid "Books by this publisher"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:408
-msgid "Books with the same tags"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:175
 msgid "Configure calibre"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:411
-msgid "Ctrl+P"
-msgstr ""
+msgstr "Konfigurér calibre"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:20
 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 ""
+"Omdirigér konsol-output til et dialogvindue (både stdout og stderr). "
+"Anvendeligt på windows når GUI apps ikke har en output-strøm."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:61
 msgid "&Preferences"
-msgstr ""
+msgstr "&Indstillinger"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:62
 msgid "&Quit"
-msgstr ""
+msgstr "&Afslut"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:90
 msgid "ERROR: Unhandled exception"
-msgstr ""
+msgstr "FEJL: Uhåndteret undtagelse"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:89
 msgid "Book has neither title nor ISBN"
-msgstr ""
+msgstr "Bog har hverken titel eller ISBN"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:115
 msgid "No matches found for this book"
-msgstr ""
+msgstr "Ingen match fundet for denne book"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:553
 msgid "Search"
 msgstr "Søg"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:315
+msgid "The selected search will be <b>permanently deleted</b>. Are you sure?"
+msgstr "Den valgte søgning vil blive <b>permanent slettet</b>. Er du sikker?"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:357
+msgid "Search (For Advanced Search click the button to the left)"
+msgstr "Søgning (For avanceret søgning klik knappen til venstre)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:398
+msgid "Saved Searches"
+msgstr "Gemte søgninger"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:406
+msgid "Choose saved search or enter name for new saved search"
+msgstr "Vælg gemte søgninget eller indtast navn for ny gemt søgning"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:10
+msgid "Restrict to"
+msgstr "Begræns til"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:48
+msgid "({0} of {1})"
+msgstr "({0} af {1})"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
+msgid "(all books)"
+msgstr "(alle bøger)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:56
+msgid "({0} of all)"
+msgstr "({0} af alle)"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:58
 msgid "Press a key..."
-msgstr ""
+msgstr "Tryk en tast..."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:79
 msgid "Already assigned"
-msgstr ""
+msgstr "Allerede tilegnet"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:81
 msgid "already assigned to"
-msgstr ""
+msgstr "allerede tilegnet til"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:131
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:223
 msgid " or "
-msgstr ""
+msgstr " eller "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:133
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:69
 msgid "&Default"
-msgstr ""
+msgstr "&Standard"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:135
 msgid "Customize shortcuts for"
-msgstr ""
+msgstr "Brugertilpas genveje for"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:223
 msgid "Keys"
-msgstr ""
+msgstr "Nøgler"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:225
 msgid "Double click to change"
-msgstr ""
+msgstr "Dobbeltklik for at ændre"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:68
 msgid "Frame"
-msgstr ""
+msgstr "Ramme"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:70
 msgid "&Custom"
-msgstr ""
+msgstr "&Brugerdefinér"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:71
 msgid "&Shortcut:"
-msgstr ""
+msgstr "&Genvej:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:72
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:77
 msgid "Click to change"
-msgstr ""
+msgstr "Klik for at ændre"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:74
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:79
 msgid "Clear"
-msgstr ""
+msgstr "Ryd"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:76
 msgid "&Alternate shortcut:"
-msgstr ""
+msgstr "&Alternativ genvej:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:154
-msgid "Jobs:"
-msgstr "Opgaver:"
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:191
+msgid "Rename '%s'"
+msgstr "Omdøb '%s'"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:163
-msgid "Click to see list of active jobs."
-msgstr "Klik for at se en liste over aktive opgaver."
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:195
+msgid "Edit sort for '%s'"
+msgstr "Redigér sortering for '%s'"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:201
-msgid "Click to browse books by their covers"
-msgstr ""
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:200
+msgid "Hide category %s"
+msgstr "Gem kategori %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:201
-msgid "Click to turn off Cover Browsing"
-msgstr ""
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:203
+msgid "Show category"
+msgstr "Vis kategori"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:206
-msgid ""
-"<p>Browsing books by their covers is disabled.<br>Import of pictureflow "
-"module failed:<br>"
-msgstr ""
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:207
+msgid "Show all categories"
+msgstr "Vis alle kategorier"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:214
-msgid "Click to browse books by tags"
-msgstr ""
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:218
+msgid "Manage %s"
+msgstr "Administrér %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:151
-msgid "Authors"
-msgstr ""
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:221
+msgid "Manage Saved Searches"
+msgstr "Administrér gemte søgninger"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:151
-msgid "Publishers"
-msgstr ""
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:232
+msgid "Manage User Categories"
+msgstr "Administrér brugerkategorier"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:271
 msgid "Searches"
+msgstr "Søgninger"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:511
+msgid "Duplicate search name"
+msgstr "Duplikér søgenavn"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:512
+msgid "The saved search name %s is already used."
+msgstr "Det gemte søgenavn %s er allerede brugt."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:768
+msgid "Sort by name"
+msgstr "Sortér efter navn"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:768
+msgid "Sort by popularity"
+msgstr "Sortér efter popularitet"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:769
+msgid "Sort by average rating"
+msgstr "Sortér efter middelvurdering"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:772
+msgid "Set the sort order for entries in the Tag Browser"
+msgstr "Angiv sorteringsrækkefølgen for indgange mærkat-browser"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:778
+msgid "Match all"
+msgstr "Match alle"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:778
+msgid "Match any"
+msgstr "Match enhver"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:783
+msgid ""
+"When selecting multiple entries in the Tag Browser match any or all of them"
 msgstr ""
+"Når multiple indgange vælges i mærkat-browser, match enhver eller dem alle"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:787
+msgid "Manage &user categories"
+msgstr "Administrér &brugerkategorier"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:790
+msgid "Add your own categories to the Tag Browser"
+msgstr "Tilføj dine egne kategorier til mærkat-browseren"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182
 msgid "Convert book %d of %d (%s)"
-msgstr ""
+msgstr "Konverterer bog %d af %d (%s)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:90
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:202
 msgid "Could not convert some books"
-msgstr ""
+msgstr "Kunne ikke konvertere nogle bøger"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:91
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:203
@@ -6330,719 +8545,223 @@ msgid ""
 "Could not convert %d of %d books, because no suitable source format was "
 "found."
 msgstr ""
+"Kunne ikke konvertere %d af %d bøger, fordi ingen egnede kildeformater blev "
+"fundet."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:120
 msgid "Queueing books for bulk conversion"
-msgstr ""
+msgstr "Lægger bøger i kø for klyngekonvertering"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:181
 msgid "Queueing "
-msgstr ""
+msgstr "Lægger i kø "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:239
 msgid "Fetch news from "
-msgstr ""
+msgstr "Henter nyheder fra "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:301
 msgid "Convert existing"
-msgstr ""
+msgstr "Konverterer eksisterende"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:302
 msgid ""
 "The following books have already been converted to %s format. Do you wish to "
 "reconvert them?"
 msgstr ""
+"Følgende bøger er allerede konverteret til %s formatet. Ønsker du at "
+"genkonvertere dem?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:67
-msgid "Save single format to disk..."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:148
-msgid "Search (For Advanced Search click the button to the left)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:154
-msgid "Saved Searches"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:177
-msgid "Error communicating with device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:194
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:162
 msgid "&Restore"
-msgstr ""
+msgstr "&Gendan"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:164
 msgid "&Donate to support calibre"
-msgstr ""
+msgstr "&Donér for at støtte calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:168
 msgid "&Eject connected device"
-msgstr ""
+msgstr "&Skub forbunden enhed ud"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:173
 msgid "&Restart"
-msgstr ""
+msgstr "&Genstart"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:244
-msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:250
-msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:273
-msgid "Edit metadata individually"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:275
-msgid "Edit metadata in bulk"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:277
-msgid "Download metadata and covers"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:278
-msgid "Download only metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:279
-msgid "Download only covers"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:280
-msgid "Download only social metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:284
-msgid "Merge into first selected book - delete others"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:286
-msgid "Merge into first selected book - keep others"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:293
-msgid "Add books from a single directory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:294
-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/ui.py:297
-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/ui.py:300
-msgid "Add Empty book. (Book entry with no formats)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:348
-msgid "Save to disk in a single directory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:349
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2172
-msgid "Save only %s format to disk"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:358
-msgid "View specific format"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:363
-msgid "Remove selected books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:365
-msgid "Remove files of a specific format from selected books.."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:367
-msgid "Remove all formats from selected books, except..."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:369
-msgid "Remove covers from selected books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:406
-msgid "Convert individually"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:407
-msgid "Bulk convert"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:410
-msgid "Create catalog of books in your calibre library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:426
-msgid "Run welcome wizard"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:462
-msgid "Similar books..."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:227
 msgid "Calibre Quick Start Guide"
-msgstr ""
+msgstr "Calibre kvik start guide"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:745
-msgid "Browse by covers"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:802
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:806
-msgid "(all books)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:811
-msgid "(%d found)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:901
-msgid "Device: "
-msgstr "Enhed: "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:903
-msgid " detected."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:931
-msgid "Connected "
-msgstr "Forbundet "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:943
-msgid "Device database corrupted"
-msgstr "Enheds database korrumperet"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:944
-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 ""
-"\n"
-"                <p>Bog-databasen på enheden er korrumperet. Forsøg "
-"følgende:\n"
-"                <ol>\n"
-"                <li>Afbryd forbindelsen til enheden.  Vent indtil enheden "
-"færdiggør regenerering af databasen (dvs. vent til den er klar til brug). "
-"Forbind enheden igen. Nu burde den virke med %(app)s. Hvis ikke, forsøg da "
-"næste trin.</li>\n"
-"                <li>Afslut %(app)s. Find filen media.xml på enheden. Slet "
-"den. Afbryd forbindelsen til enheden.  Vent indtil enheden færdiggør "
-"regenerering af filen. Forbind enheden igen og start %(app)s.</li>\n"
-"                <ol>\n"
-"                "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1003
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1180
-msgid "Use library only"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1004
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1181
-msgid "User annotations generated from main library only"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1011
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1492
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1549
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1587
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1608
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1734
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1799
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1917
-msgid "No books selected"
-msgstr "Ingen bøger valgt"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1012
-msgid "No books selected to fetch annotations from"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1037
-msgid "Merging user annotations into database"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1065
-msgid "%s<br />Last Page Read: %d (%d%%)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1071
-msgid "%s<br />Last Page Read: Location %d (%d%%)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1090
-msgid "<b>Location %d &bull; %s</b><br />%s<br />"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1099
-msgid "<b>Page %d &bull; %s</b><br />"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1104
-msgid "<b>Location %d &bull; %s</b><br />"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1224
-msgid "How many empty books?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1225
-msgid "How many empty books should be added?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1273
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1324
-msgid "Uploading books to device."
-msgstr "Sender bøger til enheden."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1285
-msgid "EPUB Books"
-msgstr "EPUB Bøger"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1286
-msgid "LRF Books"
-msgstr "LRF Bøger"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1287
-msgid "HTML Books"
-msgstr "HTML Bøger"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1288
-msgid "LIT Books"
-msgstr "LIT Bøger"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1289
-msgid "MOBI Books"
-msgstr "MOBI Bøger"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1290
-msgid "Topaz books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1291
-msgid "Text books"
-msgstr "Tekst Bøger"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1292
-msgid "PDF Books"
-msgstr "PDF Bøger"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1293
-msgid "Comics"
-msgstr "Tegneserier"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1294
-msgid "Archives"
-msgstr "Arkiver"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1298
-msgid "Supported books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1333
-msgid "Merged some books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1334
-msgid ""
-"Some duplicates were found and merged into the following existing books:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1343
-msgid "Failed to read metadata"
-msgstr "Kunne ikke læse metadata"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1344
-msgid "Failed to read metadata from the following"
-msgstr "Kunne ikke læse metadata fra følgende"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1364
-msgid "Cannot delete"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1367
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2061
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2077
-msgid "No book selected"
-msgstr "Ingen bog valgt"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1377
-msgid "Choose formats to be deleted"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1395
-msgid "Choose formats <b>not</b> to be deleted"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1433
-msgid ""
-"The selected books will be <b>permanently deleted</b> and the files removed "
-"from your computer. Are you sure?"
-msgstr ""
-"De valgte bøger vil blive <b>permanent slettet</b> og filerne fjernet fra "
-"din computer. Er du sikker på du vil gøre dette?"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1460
-msgid "Deleting books from device."
-msgstr "Sletter bøger fra enheden."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1491
-msgid "Cannot download metadata"
-msgstr "Kan ikke downloade metadata"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1507
-msgid "social metadata"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1509
-msgid "covers"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1509
-msgid "metadata"
-msgstr "metadata"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1511
-msgid "Downloading %s for %d book(s)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1533
-msgid "Failed to download some metadata"
-msgstr "Nogle metadata kunne ikke hentes"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1534
-msgid "Failed to download metadata for the following:"
-msgstr "Metadata for følgende kunne ikke hentes:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1537
-msgid "Failed to download metadata:"
-msgstr "Metadata kunne ikke hentes:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1548
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1586
-msgid "Cannot edit metadata"
-msgstr "Kan ikke redigere metadata"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1607
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1610
-msgid "Cannot merge books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1611
-msgid "At least two books must be selected for merging"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1615
-msgid ""
-"All book formats and metadata from the selected books will be added to the "
-"<b>first selected book.</b><br><br> The second and subsequently selected "
-"books will not be deleted or changed.<br><br>Please confirm you want to "
-"proceed."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1626
-msgid ""
-"All book formats and metadata from the selected books will be merged into "
-"the <b>first selected book</b>.<br><br>After merger the second and "
-"subsequently selected books will be <b>deleted</b>. <br><br>All book formats "
-"of the first selected book will be kept and any duplicate formats in the "
-"second and subsequently selected books will be permanently <b>deleted</b> "
-"from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1638
-msgid ""
-"You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
-"proceed?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1733
-msgid "Cannot save to disk"
-msgstr "Kan ikke gemme til disk"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1736
-msgid "Choose destination directory"
-msgstr "Vælg destinationsmappe"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1769
-msgid "Error while saving"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1770
-msgid "There was an error while saving."
-msgstr "En fejl indtraf ved forsøg på at gemme"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1777
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1778
-msgid "Could not save some books"
-msgstr "Kunne ikke gemme visse bøger"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1779
-msgid "Click the show details button to see which ones."
-msgstr "Klik vis detaljer knappen for at se hvilke."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1800
-msgid "No books selected to generate catalog for"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1817
-msgid "Generating %s catalog..."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1823
-msgid ""
-"No books to catalog\n"
-"Check exclude tags"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1833
-msgid "Catalog generated."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1836
-msgid "Export Catalog Directory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1837
-msgid "Select destination for %s.%s"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1851
-msgid "Fetching news from "
-msgstr "Henter news fra "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1865
-msgid " fetched."
-msgstr " hentet."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1916
-msgid "Cannot convert"
-msgstr "Kan ikke konvertere"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:1945
-msgid "Starting conversion of %d book(s)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2061
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2114
-msgid "Cannot view"
-msgstr "Kan ikke vise"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2076
-msgid "Cannot open folder"
-msgstr "Kan ikke åbne mappe"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2098
-msgid "Multiple Books Selected"
-msgstr "Flere bøger valgt"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2099
-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 ""
-"Du forsøger at åbne %d bøger. At åbne for mange bøger på en gang kan tage "
-"tid og have en negativ effekt på din computers hastighed. Når processen er "
-"startet kan den ikke stoppes. Ønsker du at fortsætte?"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2115
-msgid "%s has no available formats."
-msgstr "%s har ingen tilgængelige formater."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2156
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:380
 msgid "Cannot configure"
 msgstr "Kan ikke konfigurere"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2157
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:376
 msgid "Cannot configure while there are running jobs."
-msgstr "Kan ikke konfigurere mens processer kører."
+msgstr "Kan ikke konfigurere mens opgaver kører."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2200
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:381
+msgid "Cannot configure before calibre is restarted."
+msgstr "Kan ikke konfigurere før calibre genstartes."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:424
 msgid "No detailed info available"
 msgstr "Ingen detaljeret information tilgængelig"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2201
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:425
 msgid "No detailed information is available for books on the device."
-msgstr "Ingen detaljeret information tilgængelig for bøger på enheden."
+msgstr "Ingen detaljeret information tilgængelig om bøger på enheden."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2257
-msgid "Error talking to device"
-msgstr "Fejl ved kommunikation med enhed"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2258
-msgid ""
-"There was a temporary error talking to the device. Please unplug and "
-"reconnect the device and or reboot."
-msgstr ""
-"Der var en midlertidig fejl ved kommunikation med enheden. Afbryd og "
-"genforbind enheden eller genstart."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2281
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2309
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
-msgstr ""
+msgstr "Konverteringsfejl"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2282
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:478
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using third party tools."
 msgstr ""
+"<p>Kunne ikke konvertere: %s<p>Det er en e-bog med <a href=\"%s\">DRM</a>. "
+"Du skal først fjerne DRM med et tredjepartsværktøj."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2295
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:491
 msgid "Recipe Disabled"
-msgstr ""
+msgstr "Opskrift deaktiveret"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2310
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:506
 msgid "<b>Failed</b>"
-msgstr ""
+msgstr "<b>Fejlede</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2358
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:546
 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."
+"you find it useful, please consider donating to support its development. "
+"Your donation helps keep calibre development going."
 msgstr ""
+"er resultatet af mange frivilliges indsats fra hele verden. Hvis du finder "
+"calibre brugbart, venligst overvej at give en donation for at støtte dets "
+"udvikling. Din donation hjælper med calibres fortsatte udvikling."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2383
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:572
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr "Der er aktive opgaver. Er du sikker på du vil afslutte?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2386
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:575
 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 ""
+" kommunikerer med enheden!<br>\n"
+"                      Calibre afslutning kan forvanske emner på "
+"enheden.<br>\n"
+"                      Er du sikker på at du vil afslutte?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2390
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:579
 msgid "WARNING: Active jobs"
 msgstr "ADVARSEL: Aktive opgaver"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2442
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:632
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
 msgstr ""
+"vil fortsætte med at køre i systembakken. For at afslutte dem, vælg "
+"<b>Quit/Afslut</b> i systembakkens context menu."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2461
-msgid ""
-"<span style=\"color:red; font-weight:bold\">Latest version: <a "
-"href=\"%s\">%s</a></span>"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2469
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:56
 msgid "Update available"
-msgstr ""
+msgstr "Opdateringer tilgængelig"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:2470
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:57
 msgid ""
 "%s has been updated to version %s. See the <a href=\"http://calibre-"
 "ebook.com/whats-new\">new features</a>. Visit the download page?"
 msgstr ""
+"%s er blevet opdateret til version %s. Se <a href=\"http://calibre-"
+"ebook.com/whats-new\">nye funktioner</a>. Besøg download siden?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:43
 msgid "Edit bookmark"
-msgstr ""
+msgstr "Redigér bogmærke"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:43
 msgid "New title for bookmark:"
-msgstr ""
+msgstr "Ny titel til bogmærke:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:52
 msgid "Export Bookmarks"
-msgstr ""
+msgstr "Eksportér bogmærker"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:54
 msgid "Saved Bookmarks (*.pickle)"
-msgstr ""
+msgstr "Gemte bogmærker (*.pickle)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:62
 msgid "Import Bookmarks"
-msgstr ""
+msgstr "Importér bogmærker"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:62
 msgid "Pickled Bookmarks (*.pickle)"
-msgstr ""
+msgstr "Pickled bogmærker (*.pickle)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:89
 msgid "Name"
-msgstr ""
+msgstr "Navn"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:56
 msgid "Bookmark Manager"
-msgstr ""
+msgstr "Administrér bogmærker"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:57
 msgid "Actions"
-msgstr ""
+msgstr "Handlinger"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:58
 msgid "Edit"
-msgstr ""
+msgstr "Rediger"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:59
 msgid "Delete"
-msgstr ""
+msgstr "Slet"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:60
 msgid "Reset"
-msgstr ""
+msgstr "Nulstil"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:61
 msgid "Export"
-msgstr ""
+msgstr "Eksportér"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:62
 msgid "Import"
-msgstr ""
+msgstr "Importér"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:154
 msgid "Configure Ebook viewer"
-msgstr ""
+msgstr "Konfigurér Ebook læser"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:155
 msgid "&Font options"
-msgstr ""
+msgstr "&Skrifttypevalg"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:156
 msgid "Se&rif family:"
-msgstr ""
+msgstr "Se&rif-familien:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:157
 msgid "&Sans family:"
-msgstr ""
+msgstr "&Sans-familien:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:158
 msgid "&Monospace family:"
-msgstr ""
+msgstr "&Monospace-familien:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:159
 msgid "&Default font size:"
-msgstr "S&tandardskriftstørrelse"
+msgstr "&Standard skriftstørrelse:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:160
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:162
@@ -7052,7 +8771,7 @@ msgstr " px"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:161
 msgid "Monospace &font size:"
-msgstr ""
+msgstr "Monospace-&skriftstørrelse:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:163
 msgid "S&tandard font:"
@@ -7076,25 +8795,27 @@ msgstr "Husk størrelsen på &vinduet"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:169
 msgid "Maximum &view width:"
-msgstr "Maksimal s&ynlig bredde"
+msgstr "Maksimal s&ynlig bredde:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:170
 msgid "H&yphenate (break line in the middle of large words)"
-msgstr ""
+msgstr "O&rddél (del linjer i midten af lange ord)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:171
 msgid ""
 "The default language to use for hyphenation rules. If the book does not "
 "specify a language, this will be used."
 msgstr ""
+"Det anvendte standardsprog til orddelingsregler. Hvis bogen ikke "
+"specificerer et sprog, vil dette blive anvendt."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:172
 msgid "Default &language for hyphenation:"
-msgstr ""
+msgstr "Standard &sprog ved orddeling:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:173
 msgid "&Resize images larger than the viewer window (needs restart)"
-msgstr ""
+msgstr "&Skalér billeder større end visningsvinduet (kræver genstart)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:174
 msgid "&User stylesheet"
@@ -7102,19 +8823,19 @@ msgstr "&Brugerstilark"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:175
 msgid "&General"
-msgstr ""
+msgstr "&Generelt"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:176
 msgid "Double click to change a keyboard shortcut"
-msgstr ""
+msgstr "Dobbeltklik for at ændre en tastaturgenvej"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:177
 msgid "&Keyboard shortcuts"
-msgstr ""
+msgstr "&Tastaturgenvej"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/dictionary.py:53
 msgid "No results found for:"
-msgstr ""
+msgstr "Ingen resultater fundet for:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:35
 msgid "Options to customize the ebook viewer"
@@ -7141,14 +8862,15 @@ msgstr "Maksimal bredde på viserens vindue, i pixels"
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:48
 msgid "Resize images larger than the viewer window to fit inside it"
 msgstr ""
+"Skalér billeder større end visningsvinduet for at det kan rummes heri"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:49
 msgid "Hyphenate text"
-msgstr ""
+msgstr "Orddel tekst"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:51
 msgid "Default language for hyphenation rules"
-msgstr ""
+msgstr "Standard sprog for orddelingsregler"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:53
 msgid "Font options"
@@ -7156,193 +8878,195 @@ msgstr "Skrifttypeindstillinger"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:55
 msgid "The serif font family"
-msgstr ""
+msgstr "Serif-skrifttypefamilien"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:57
 msgid "The sans-serif font family"
-msgstr ""
+msgstr "Sans-serif-skrifttypefamilien"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:59
 msgid "The monospaced font family"
-msgstr ""
+msgstr "Monospaced-skrifttypefamilien"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:60
 msgid "The standard font size in px"
-msgstr ""
+msgstr "Standard skriftstørrelse i px"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:61
 msgid "The monospaced font size in px"
-msgstr ""
+msgstr "Monospaced skriftstørrelse i px"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:62
 msgid "The standard font type"
-msgstr ""
+msgstr "Standard skrifttype"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:452
 msgid "&Lookup in dictionary"
-msgstr ""
+msgstr "&Opslag i ordbog"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:455
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:138
 msgid "Go to..."
-msgstr ""
+msgstr "Gå til..."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:467
 msgid "Next Section"
-msgstr ""
+msgstr "Næste sektion"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:468
 msgid "Previous Section"
-msgstr ""
+msgstr "Forrige sektion"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:470
 msgid "Document Start"
-msgstr ""
+msgstr "Dokument start"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:471
 msgid "Document End"
-msgstr ""
+msgstr "Dokument slut"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:473
 msgid "Section Start"
-msgstr ""
+msgstr "Sektion start"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:474
 msgid "Section End"
-msgstr ""
+msgstr "Sektion slut"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:12
 msgid "Scroll to the next page"
-msgstr ""
+msgstr "Rul til den næste side"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:15
 msgid "Scroll to the previous page"
-msgstr ""
+msgstr "Rul til den forrige side"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:18
 msgid "Scroll to the next section"
-msgstr ""
+msgstr "Rul til den næste sektion"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:21
 msgid "Scroll to the previous section"
-msgstr ""
+msgstr "Rul til den forrige sektion"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:24
 msgid "Scroll to the bottom of the section"
-msgstr ""
+msgstr "Rul til bunden af sektionen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:27
 msgid "Scroll to the top of the section"
-msgstr ""
+msgstr "Rul til toppen af sektionen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:30
 msgid "Scroll to the end of the document"
-msgstr ""
+msgstr "Rul til enden af dokumentet"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:33
 msgid "Scroll to the start of the document"
-msgstr ""
+msgstr "Rul til starten af dokumentet"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:36
 msgid "Scroll down"
-msgstr ""
+msgstr "Rul ned"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:39
 msgid "Scroll up"
-msgstr ""
+msgstr "Rul op"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:42
 msgid "Scroll left"
-msgstr ""
+msgstr "Rul til venstre"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:45
 msgid "Scroll right"
-msgstr ""
+msgstr "Rul til højre"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:115
 msgid "Book format"
-msgstr ""
+msgstr "Bogformat"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:184
 msgid "Position in book"
-msgstr ""
+msgstr "Position i bog"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:191
 msgid "Go to a reference. To get reference numbers, use the reference mode."
 msgstr ""
+"Gå til en reference. For at få reference numre, anvend reference tilstand."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:199
 msgid "Search for text in book"
-msgstr ""
+msgstr "Søg efter tekst bog"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:268
 msgid "Print Preview"
-msgstr ""
+msgstr "Forhåndsvisning af udskrift"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:299
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
-msgstr ""
+msgstr "Forbinder til dict.org for opslag: <b>%s</b>&hellip;"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:398
 msgid "Choose ebook"
-msgstr ""
+msgstr "Vælg e-bog"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:399
 msgid "Ebooks"
-msgstr ""
+msgstr "E-bøger"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:418
 msgid "Add bookmark"
-msgstr ""
+msgstr "Tilføj bogmærke"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:418
 msgid "Enter title for bookmark:"
-msgstr ""
+msgstr "Indtast bogmærketitel:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:441
 msgid "No matches found for: %s"
-msgstr ""
+msgstr "Ingen match fundet for: %s"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:478
 msgid "Loading flow..."
-msgstr ""
+msgstr "Henter flow..."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:514
 msgid "Laying out %s"
-msgstr ""
+msgstr "Udlægning %s"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:543
 msgid "Manage Bookmarks"
-msgstr ""
+msgstr "Administrér bogmærker"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:578
 msgid "Loading ebook..."
-msgstr ""
+msgstr "Henter e-bog..."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:586
 msgid "DRM Error"
-msgstr ""
+msgstr "DRM-fejl"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:587
 msgid "<p>This book is protected by <a href=\"%s\">DRM</a>"
-msgstr ""
+msgstr "<p>Denne bog er beskyttet af <a href=\"%s\">DRM</a>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:591
 msgid "Could not open ebook"
-msgstr ""
+msgstr "Kunne ikke åbne e-bog"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665
 msgid "Options to control the ebook viewer"
-msgstr ""
+msgstr "Valg til at styre e-bogsviser"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:672
 msgid ""
 "If specified, viewer window will try to come to the front when started."
 msgstr ""
+"Hvis specificeret, vil visningsvindue prøve at komme i front ved start."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677
 msgid "Print javascript alert and console messages to the console"
-msgstr ""
+msgstr "Udskriv javascript alert og konsol beskeder til konsolen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:683
 msgid ""
@@ -7350,201 +9074,181 @@ msgid ""
 "\n"
 "View an ebook.\n"
 msgstr ""
+"%prog [valg] fil\n"
+"\n"
+"Vis en e-bog.\n"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:184
 msgid "E-book Viewer"
-msgstr ""
+msgstr "E-bogsviser"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:185
 msgid "Close dictionary"
-msgstr ""
+msgstr "Luk ordbog"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:187
 msgid "toolBar"
-msgstr ""
+msgstr "Værktøjslinje"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:190
 msgid "Next page"
-msgstr ""
+msgstr "Næste side"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:191
 msgid "Previous page"
-msgstr ""
+msgstr "Forrige side"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:192
 msgid "Font size larger"
-msgstr ""
+msgstr "Skriftstørrelse større"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:193
 msgid "Font size smaller"
-msgstr ""
+msgstr "Skriftstørrelse mindre"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:197
 msgid "Find next"
-msgstr ""
+msgstr "Find næste"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:198
 msgid "Find next occurrence"
-msgstr ""
+msgstr "Find næste forekomst"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:199
 msgid "F3"
-msgstr ""
+msgstr "F3"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:200
 msgid "Copy to clipboard"
-msgstr ""
+msgstr "Kopiér til udklipsholder"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:202
 msgid "Reference Mode"
-msgstr ""
+msgstr "Reference tilstand"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:203
 msgid "Bookmark"
-msgstr ""
+msgstr "Bogmærk"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:204
 msgid "Toggle full screen"
-msgstr ""
+msgstr "Skift til fuldskærm"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:205
 msgid "Print"
-msgstr ""
+msgstr "Udskriv"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Find previous"
-msgstr ""
+msgstr "Find forrige"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:207
 msgid "Find previous occurrence"
-msgstr ""
+msgstr "Find forrige forekomst"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:208
 msgid "Shift+F3"
-msgstr ""
+msgstr "Skift+F3"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/printing.py:114
 msgid "Print eBook"
-msgstr ""
+msgstr "Udskriv e-bog"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:196
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
 msgid "Copy Image"
-msgstr ""
+msgstr "Kopiér billede"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:197
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:239
 msgid "Paste Image"
-msgstr ""
+msgstr "Indsæt billede"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:226
-msgid ""
-"Library\n"
-"%d\n"
-"books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:227
-msgid ""
-"Reader\n"
-"%s\n"
-"available"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:228
-msgid ""
-"Card A\n"
-"%s\n"
-"available"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:229
-msgid ""
-"Card B\n"
-"%s\n"
-"available"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:234
-msgid "Click to see the books available on your computer"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:235
-msgid "Click to see the books in the main memory of your reader"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:236
-msgid "Click to see the books on storage card A in your reader"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237
-msgid "Click to see the books on storage card B in your reader"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:364
 msgid "Change Case"
-msgstr ""
+msgstr "Skift versaltype"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:365
 msgid "Upper Case"
-msgstr ""
+msgstr "Store bogstaver"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:532
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:366
 msgid "Lower Case"
-msgstr ""
+msgstr "Små bogstaver"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:367
 msgid "Swap Case"
-msgstr ""
+msgstr "Skift store/små bogstaver"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:368
 msgid "Title Case"
-msgstr ""
+msgstr "Titel STORE/små bogstaver"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:837
+msgid "Drag to resize"
+msgstr "Træk til skaléring"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:869
+msgid "Show"
+msgstr "Vis"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:876
+msgid "Hide"
+msgstr "Skjul"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:367
 msgid ""
 "If you use the WordPlayer e-book app on your Android phone, you can access "
 "your calibre book collection directly on the device. To do this you have to "
 "turn on the content server."
 msgstr ""
+"Hvis du anvender WordPlayer e-book app på din Android phone, kan du tilgå "
+"din calibre bogsamling direkte på enheden. For at gøre dette skal du starte "
+"indholdsserveren."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:370
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:371
 msgid ""
 "Remember to leave calibre running as the server only runs as long as calibre "
 "is running."
 msgstr ""
+"Husk at lade calibre køre, da dens server kun kører, når calibre kører."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:373
 msgid ""
 "You have to add the URL http://myhostname:8080 as your calibre library in "
 "WordPlayer. Here myhostname should be the fully qualified hostname or the IP "
 "address of the computer calibre is running on."
 msgstr ""
+"Du skal tilføje URL http://mitværtsnavn:8080 som dit calibre bibliotek i "
+"WordPlayer. Her skal mitværtsnavn være det fuldt kvalificerede værtsnavn "
+"eller IP-adresse, computeren calibre kører på."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:449
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:450
 msgid "Moving library..."
-msgstr ""
+msgstr "Flytter bibliotek..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:465
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:466
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:467
 msgid "Failed to move library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:520
-msgid "Invalid database"
-msgstr ""
+msgstr "Flytning af bibliotek fejlede"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:521
+msgid "Invalid database"
+msgstr "Ugyldig database"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:522
 msgid ""
 "<p>An invalid library already exists at %s, delete it before trying to move "
 "the existing library.<br>Error: %s"
 msgstr ""
+"<p>Et ugyldigt bibliotek eksisterer allerede ved %s, slet det før der igen "
+"prøves på at flytte det eksisterende bibliotek hertil.<br>Fejl: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:532
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:533
 msgid "Could not move library"
-msgstr ""
+msgstr "Kunne ikke flytte bibliotek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:661
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:662
 msgid "welcome wizard"
-msgstr ""
+msgstr "Velkommen guide"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/device_ui.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/device_ui.py:49
@@ -7553,7 +9257,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/library_ui.py:50
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:42
 msgid "Welcome to calibre"
-msgstr ""
+msgstr "Velkommen til calibre"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/device_ui.py:50
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/finish_ui.py:47
@@ -7561,46 +9265,48 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/library_ui.py:51
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:43
 msgid "The one stop solution to all your e-book needs."
-msgstr ""
+msgstr "One-stop-løsningen til alle dine e-bogsbehov."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/device_ui.py:51
 msgid ""
 "Choose your book reader. This will set the conversion options to produce "
 "books optimized for your device."
 msgstr ""
+"Vælg din e-bogslæser. Dette vil sørge for konverteringsvalg, som danner e-"
+"bøger, optimeret til din enhed."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/device_ui.py:52
 msgid "&Manufacturers"
-msgstr ""
+msgstr "&Producenter"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/device_ui.py:53
 msgid "&Devices"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/finish_ui.py:45
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/kindle_ui.py:41
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/library_ui.py:49
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:41
-msgid "WizardPage"
-msgstr ""
+msgstr "&Enheder"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/finish_ui.py:48
 msgid ""
 "<h2>Congratulations!</h2> You have successfully setup calibre. Press the %s "
 "button to apply your settings."
 msgstr ""
+"<h2>Tillykke!</h2> Du har succesfuldt sat calibre op. Tryk %s knappen for at "
+"anvende dine indstillinger."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/finish_ui.py:49
 msgid ""
 "<h2>Demo videos</h2>Videos demonstrating the various features of calibre are "
 "available <a href=\"http://calibre-ebook.com/demo\">online</a>."
 msgstr ""
+"<h2>Demo videoer</h2>Videoer som demonstrerer forskellige calibre "
+"funktioner, er tilgængelige <a href=\"http://calibre-"
+"ebook.com/demo\">online</a>."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/finish_ui.py:50
 msgid ""
 "<h2>User Manual</h2>A User Manual is also available <a href=\"http://calibre-"
 "ebook.com/user_manual\">online</a>."
 msgstr ""
+"<h2>Brugermanual</h2>En brugermanual er også tilgængelig <a "
+"href=\"http://calibre-ebook.com/user_manual\">online</a>."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/kindle_ui.py:44
 msgid ""
@@ -7610,24 +9316,31 @@ msgid ""
 "button below. You will also have to register your gmail address in your "
 "Amazon account."
 msgstr ""
+"<p>calibre kan automatisk sende e-bøger via e-mail til dil Kindle. For at "
+"gøre dette skal du sætte e-mail levering op nedenfor. Det letteste måde er "
+"at oprette en gratis <a href=\"http://gmail.com\">gmail konto</a> op og klik "
+"på Use gmail knappen nedenfor. Du bliver også nødt til at registrere din "
+"gmail-adresse i din Amazon-konto."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/kindle_ui.py:45
 msgid "&Kindle email:"
-msgstr ""
+msgstr "&Kindle e-mail:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/library_ui.py:52
 msgid "Choose your &language:"
-msgstr ""
+msgstr "Vælg dit &sprog:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/library_ui.py:53
 msgid ""
 "Choose a location for your books. When you add books to calibre, they will "
 "be copied here:"
 msgstr ""
+"Vælg en placering til dine bøger. Når du tilføjer bøger til calibre, vil de "
+"kopieres hertil:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/library_ui.py:54
 msgid "&Change"
-msgstr ""
+msgstr "&Ændre"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/library_ui.py:55
 msgid ""
@@ -7635,10 +9348,13 @@ msgid ""
 "location. If a calibre library already exists at the new location, calibre "
 "will switch to using it."
 msgstr ""
+"Hvis du har et eksisterende calibre-bibliotek, vil det blive kopieret til "
+"den nye placering. Hvis der allerede er et calibre-bibliotek på den nye "
+"placering, vil calibre skifte til at anvende dette."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:32
 msgid "Using: %s:%s@%s:%s and %s encryption"
-msgstr ""
+msgstr "Anvender: %s:%s@%s:%s og %s kryptering"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:37
 msgid "Sending..."
@@ -7646,17 +9362,19 @@ msgstr "Sender..."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:42
 msgid "Mail successfully sent"
-msgstr "Mail blev sendt uden problemer"
+msgstr "Mail blev succesfuldt sendt"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:114
 msgid "Finish gmail setup"
-msgstr "Færdiggør gmail setup"
+msgstr "Færdiggør gmail opsætning"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:115
 msgid ""
 "Dont forget to enter your gmail username and password. You can sign up for a "
 "free gmail account at http://gmail.com"
 msgstr ""
+"Glem ikke at indtaste dit gmail brugernavn og adgangskode. Du kan registrere "
+"dig til en gratis gmail-konto på http://gmail.com"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:123
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:130
@@ -7665,11 +9383,11 @@ msgstr "Ugyldig konfiguration"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:124
 msgid "You must set the From email address"
-msgstr "Du skal angive Fra e-mailadressen"
+msgstr "Du skal angive Fra e-mail-adressen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:131
 msgid "You must set the username and password for the mail server."
-msgstr "Du skal angive brugernavn og adgangskode for mailserveren"
+msgstr "Du skal angive brugernavn og adgangskode til mailserveren"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:108
 msgid "Send email &from:"
@@ -7680,8 +9398,8 @@ msgid ""
 "<p>This is what will be present in the From: field of emails sent by "
 "calibre.<br> Set it to your email address"
 msgstr ""
-"<p>Dette er hvad der vil stå i Fra: feltet for e-mails send af calibre.<br> "
-"Sæt det til din e-mailadresse"
+"<p>Dette er hvad der vil stå i Fra: feltet for e-mails sendt fra "
+"calibre.<br> Sæt det til din e-mail-adresse"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:110
 msgid ""
@@ -7697,7 +9415,9 @@ msgstr "Mail&server"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:112
 msgid "calibre can <b>optionally</b> use a server to send mail"
-msgstr "calibre kan <b>alternativt</b> bruge en server til at sende e-mails"
+msgstr ""
+"calibre kan <b>alternativt</b> bruge en separat smtp-server til at sende e-"
+"mails"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:113
 msgid "&Hostname:"
@@ -7705,7 +9425,7 @@ msgstr "&Værtsnavn:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:114
 msgid "The hostname of your mail server. For e.g. smtp.gmail.com"
-msgstr "Værtsnavnet for din mailserver. For eksempel smtp.gmail.com"
+msgstr "Værtsnavnet for din smtp-server. For eksempel smtp.gmail.com"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:115
 msgid "&Port:"
@@ -7715,15 +9435,15 @@ msgstr "&Port:"
 msgid ""
 "The port your mail server listens for connections on. The default is 25"
 msgstr ""
-"Porten din mailserver lytter efter forbindelser på. Standardværdien er 25"
+"IP-porten din smtp-server lytter efter forbindelser på. Standardværdien er 25"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:118
 msgid "Your username on the mail server"
-msgstr "Dit brugernavn på mailserveren"
+msgstr "Dit brugernavn på smtp-serveren"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:120
 msgid "Your password on the mail server"
-msgstr "Din adgangskode på mailserveren"
+msgstr "Din adgangskode på smtp-serveren"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:121
 msgid "&Show"
@@ -7738,7 +9458,7 @@ msgid ""
 "Use TLS encryption when connecting to the mail server. This is the most "
 "common."
 msgstr ""
-"Brug TLS kryptering når der forbindes til mailserveren. Dette er det mest "
+"Brug TLS-kryptering når der forbindes til smtp-serveren. Dette er det mest "
 "normale."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:124
@@ -7747,7 +9467,7 @@ msgstr "&TLS"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:125
 msgid "Use SSL encryption when connecting to the mail server."
-msgstr "Brug SSL kryptering når der forbindes til mailserveren"
+msgstr "Brug SSL-kryptering når der forbindes til smtp-serveren"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:126
 msgid "&SSL"
@@ -7759,7 +9479,7 @@ msgstr "Brug Gmail"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:128
 msgid "&Test email"
-msgstr "&Test email"
+msgstr "&Test e-mail"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:44
 msgid ""
@@ -7768,44 +9488,58 @@ msgid ""
 "directly on the device. To do this you have to turn on the calibre content "
 "server."
 msgstr ""
+"<p>Hvis du anvender <a href=\"http://www.lexcycle.com/download\">Stanza</a> "
+"e-book app på din iPhone/iTouch, kan du tilgå din calibre bogsamling direkte "
+"fra enheden. For at gøre dette skal du starte calibre-indholdsserveren."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:45
 msgid "Turn on the &content server"
-msgstr ""
+msgstr "Slå &indholdsserveren til"
 
-#: /home/kovid/work/calibre/src/calibre/library/__init__.py:8
-msgid "Settings to control the calibre content server"
-msgstr ""
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:230
+msgid "today"
+msgstr "i dag"
 
-#: /home/kovid/work/calibre/src/calibre/library/__init__.py:12
-msgid "The port on which to listen. Default is %default"
-msgstr ""
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:233
+msgid "yesterday"
+msgstr "i går"
 
-#: /home/kovid/work/calibre/src/calibre/library/__init__.py:14
-msgid "The server timeout in seconds. Default is %default"
-msgstr ""
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:236
+msgid "thismonth"
+msgstr "denne måned"
 
-#: /home/kovid/work/calibre/src/calibre/library/__init__.py:16
-msgid "The max number of worker threads to use. Default is %default"
-msgstr ""
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:239
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:240
+msgid "daysago"
+msgstr "dage siden"
 
-#: /home/kovid/work/calibre/src/calibre/library/__init__.py:18
-msgid "Set a password to restrict access. By default access is unrestricted."
-msgstr ""
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:398
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:408
+msgid "no"
+msgstr "nej"
 
-#: /home/kovid/work/calibre/src/calibre/library/__init__.py:20
-msgid "Username for access. By default, it is: %default"
-msgstr ""
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:398
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:408
+msgid "unchecked"
+msgstr "umarkeret"
 
-#: /home/kovid/work/calibre/src/calibre/library/__init__.py:24
-msgid "The maximum size for displayed covers. Default is %default."
-msgstr ""
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:401
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:411
+msgid "checked"
+msgstr "markeret"
 
-#: /home/kovid/work/calibre/src/calibre/library/__init__.py:26
-msgid ""
-"The maximum number of matches to return per OPDS query. This affects Stanza, "
-"WordPlayer, etc. integration."
-msgstr ""
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:401
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:411
+msgid "yes"
+msgstr "ja"
+
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:405
+msgid "blank"
+msgstr "blank"
+
+#: /home/kovid/work/calibre/src/calibre/library/caches.py:405
+msgid "empty"
+msgstr "tom"
 
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:41
 msgid ""
@@ -7815,6 +9549,11 @@ msgid ""
 "Default: '%%default'\n"
 "Applies to: CSV, XML output formats"
 msgstr ""
+"Felterne som skal sendes til output når der katalogiseres bøger i databasen. "
+" Skal være en kommasepareret feltliste.\n"
+"Tilgængelige felter: %s.\n"
+"Standard: '%%default'\n"
+"Anvendes til: CSV, XML output-formater"
 
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:51
 msgid ""
@@ -7823,15 +9562,22 @@ msgid ""
 "Default: '%default'\n"
 "Applies to: CSV, XML output formats"
 msgstr ""
+"Output-felter til at sortere på.\n"
+"Tilgængelige felter: author_sort, id, rating, size, timestamp, title.\n"
+"Standard: '%default'\n"
+"Anvendes til: CSV, XML output-formater"
 
-#: /home/kovid/work/calibre/src/calibre/library/catalog.py:262
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:202
 msgid ""
 "Title of generated catalog used as title in metadata.\n"
 "Default: '%default'\n"
 "Applies to: ePub, MOBI output formats"
 msgstr ""
+"Titel på genereret katalog anvendt som titel i metadata.\n"
+"Standard: '%default'\n"
+"Anvendes til: ePub, MOBI output-formater"
 
-#: /home/kovid/work/calibre/src/calibre/library/catalog.py:269
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:209
 msgid ""
 "Save the output from different stages of the conversion pipeline to the "
 "specified directory. Useful if you are unsure at which stage of the "
@@ -7839,15 +9585,24 @@ msgid ""
 "Default: '%default'None\n"
 "Applies to: ePub, MOBI output formats"
 msgstr ""
+"Gemmer output fra forskellige trin af konverteringspipelinen til den "
+"specificerede mappe. Anvendeligt hvis du er usikker på hvilket trin i "
+"konverteringsprocessen en fejl opstod.\n"
+"Standard: '%default'None\n"
+"Anvendes til: ePub, MOBI output-formater"
 
-#: /home/kovid/work/calibre/src/calibre/library/catalog.py:279
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:219
 msgid ""
 "Regex describing tags to exclude as genres.\n"
 "Default: '%default' excludes bracketed tags, e.g. '[<tag>]'\n"
 "Applies to: ePub, MOBI output formats"
 msgstr ""
+"Regex beskrivende mærkater til at eksludere som genre.\n"
+"Standard: '%default' eksluderer parantesomsluttede mærkater, f.eks. "
+"'[<tag>]'\n"
+"Anvendes til: ePub, MOBI output-formater"
 
-#: /home/kovid/work/calibre/src/calibre/library/catalog.py:285
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:225
 msgid ""
 "Comma-separated list of tag words indicating book should be excluded from "
 "output.  Case-insensitive.\n"
@@ -7855,29 +9610,43 @@ msgid ""
 "Default: '%default'\n"
 "Applies to: ePub, MOBI output formats"
 msgstr ""
+"Kommasepareret ordmærkatliste der indikerer hvilke bøger som skal "
+"ekskluderes fra output.  Stor/små-bogstav-uafhængig.\n"
+"--exclude-tags=skip vil matche 'skip this book' og 'Skip will like this'.\n"
+"Standard: '%default'\n"
+"Anvendes til: ePub, MOBI output-formater"
 
-#: /home/kovid/work/calibre/src/calibre/library/catalog.py:293
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:233
 msgid ""
 "Include 'Titles' section in catalog.\n"
 "Default: '%default'\n"
 "Applies to: ePub, MOBI output formats"
 msgstr ""
+"Inkludér 'Title' sektion i kataloget.\n"
+"Standard: '%default'\n"
+"Anvendes til: ePub, MOBI output-formater"
 
-#: /home/kovid/work/calibre/src/calibre/library/catalog.py:300
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:240
 msgid ""
 "Include 'Recently Added' section in catalog.\n"
 "Default: '%default'\n"
 "Applies to: ePub, MOBI output formats"
 msgstr ""
+"Inkludér 'Recently Added' sektion i kataloget.\n"
+"Standard: '%default'\n"
+"Anvendes til: ePub, MOBI output-formater"
 
-#: /home/kovid/work/calibre/src/calibre/library/catalog.py:307
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:247
 msgid ""
 "Tag prefix for user notes, e.g. '*Jeff might enjoy reading this'.\n"
 "Default: '%default'\n"
 "Applies to: ePub, MOBI output formats"
 msgstr ""
+"Mærkatpræfiks til brugernoter, f.eks. '*Jeff might enjoy reading this'.\n"
+"Standard: '%default'\n"
+"Anvendes til: ePub, MOBI output-formater"
 
-#: /home/kovid/work/calibre/src/calibre/library/catalog.py:314
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:254
 msgid ""
 "Sort titles with leading numbers as text, e.g.,\n"
 "'2001: A Space Odyssey' sorts as \n"
@@ -7885,8 +9654,13 @@ msgid ""
 "Default: '%default'\n"
 "Applies to: ePub, MOBI output formats"
 msgstr ""
+"Sortér titler med ledenumre som tekst, f.eks.,\n"
+"'2001: A Space Odyssey' sorteres som \n"
+"'Two Thousand One: A Space Odyssey'.\n"
+"Standard: '%default'\n"
+"Anvendes til: ePub, MOBI output-formater"
 
-#: /home/kovid/work/calibre/src/calibre/library/catalog.py:321
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:261
 msgid ""
 "Specifies the output profile.  In some cases, an output profile is required "
 "to optimize the catalog for the device.  For example, 'kindle' or "
@@ -7895,28 +9669,42 @@ msgid ""
 "Default: '%default'\n"
 "Applies to: ePub, MOBI output formats"
 msgstr ""
+"Specificerer output-profil.  I nogle tilfælde, er en output-profil krævet "
+"for at optimere kataloget til enheden.  For eksempel, 'kindle' eller "
+"'kindle_dx' opretter en struktureret indholdsfortegnelse med sektioner og "
+"artikler.\n"
+"Standard: '%default'\n"
+"Anvendes til: ePub, MOBI output-formater"
 
-#: /home/kovid/work/calibre/src/calibre/library/catalog.py:328
+#: /home/kovid/work/calibre/src/calibre/library/catalog.py:268
 msgid ""
 "Tag indicating book has been read.\n"
 "Default: '%default'\n"
 "Applies to: ePub, MOBI output formats"
 msgstr ""
+"Mærkat der markerer at bogen er blevet læst.\n"
+"Standard: '%default'\n"
+"Anvendes til: ePub, MOBI output-formater"
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:122
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:41
 msgid ""
 "Path to the calibre library. Default is to use the path stored in the "
 "settings."
 msgstr ""
+"Sti til calibre-biblioteket. Standard er at anvende stien gemt i "
+"indstillingerne."
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:215
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:120
 msgid ""
 "%prog list [options]\n"
 "\n"
 "List the books available in the calibre database.\n"
 msgstr ""
+"%prog list [options]\n"
+"\n"
+"Liste de tilgængelige bøger i calibre databasen.\n"
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:223
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:128
 msgid ""
 "The fields to display when listing books in the database. Should be a comma "
 "separated list of fields.\n"
@@ -7924,62 +9712,72 @@ msgid ""
 "Default: %%default. The special field \"all\" can be used to select all "
 "fields. Only has effect in the text output format."
 msgstr ""
+"Felterne som vises, når bøger listes i database. Skal være en kommasepareret "
+"feltliste.\n"
+"Tilgængelige felter: %s\n"
+"Standard: %%default. Det specielle felt \"all\" kan anvendes til at vælge "
+"alle felter. Har kun effekt i tekst-output-formatet."
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:230
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:135
 msgid ""
 "The field by which to sort the results.\n"
 "Available fields: %s\n"
 "Default: %%default"
 msgstr ""
+"Feltet som resultaterne skal sorteres efter.\n"
+"Tilgængelige felter: %s\n"
+"Standard: %%default"
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:232
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:137
 msgid "Sort results in ascending order"
-msgstr ""
+msgstr "Sortér resultaterne i stigende orden"
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:234
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:139
 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 ""
+"Filtrér resultaterne efter søgeforespørgslen. For at finde ud af formatet "
+"for søgeforespørgslen, venligst se den søge relaterede dokumentation i "
+"brugermanualen. Standard er ingen filtrering."
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:236
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:141
 msgid ""
 "The maximum width of a single line in the output. Defaults to detecting "
 "screen size."
 msgstr ""
+"Maksimale bredde af en enkelt linje i output. Standard er at detektere "
+"skærmstørrelsen."
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:237
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:142
 msgid "The string used to separate fields. Default is a space."
-msgstr ""
+msgstr "Strengen anvendt til at separere felter. Standard er et mellemrum."
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:238
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:143
 msgid ""
 "The prefix for all file paths. Default is the absolute path to the library "
 "folder."
 msgstr ""
+"Præfiks for alle filstier. Standard er en absolut sti til biblioteksmappen."
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:241
-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:263
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:165
 msgid "Invalid fields. Available fields:"
-msgstr ""
+msgstr "Ugyldige felter. Tilgængelige felter:"
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:270
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:172
 msgid "Invalid sort field. Available fields:"
-msgstr ""
+msgstr "Ugyldig sorteringsfelt. Tilgængelige felter:"
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:342
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:244
 msgid ""
 "The following books were not added as they already exist in the database "
 "(see --duplicates option):"
 msgstr ""
+"Følgende bøger blev ikke tilføjet da de allerede eksisterer i databasen (se -"
+"-duplicates option):"
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:365
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:267
 msgid ""
 "%prog add [options] file1 file2 file3 ...\n"
 "\n"
@@ -7987,44 +9785,53 @@ msgid ""
 "directories, see\n"
 "the directory related options below.\n"
 msgstr ""
+"%prog add [options] fil1 fil2 fil3 ...\n"
+"\n"
+"Tilføj de specificerede filer som bøger til databasen. Du kan også "
+"specificere mapper, se\n"
+"mappe relaterede options nedenfor.\n"
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:374
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:276
 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 ""
+"Formod at hver mappe kun har én enkelt logisk bog og at alle filer i den er "
+"forskellige e-bogsformater af denne bog"
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:376
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:278
 msgid "Process directories recursively"
-msgstr ""
+msgstr "Behandle mapper rekursivt"
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:378
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:280
 msgid ""
 "Add books to database even if they already exist. Comparison is done based "
 "on book titles."
 msgstr ""
+"Tilføj bøger til databasen selvom de allerede eksisterer. Sammenligning er "
+"baseret på bogtitlerne."
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:380
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:282
 msgid "Add an empty book (a book with no formats)"
-msgstr ""
+msgstr "Tilføj en tom bog (en bog uden formater)"
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:382
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:284
 msgid "Set the title of the added empty book"
-msgstr ""
+msgstr "Angiv titlen på den tilføjende tomme bog"
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:384
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:286
 msgid "Set the authors of the added empty book"
-msgstr ""
+msgstr "Angiv forfatterne på den tilføjende tomme bog"
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:386
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:288
 msgid "Set the ISBN of the added empty book"
-msgstr ""
+msgstr "Angiv ISBN på den tilføjede tomme bog"
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:411
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:313
 msgid "You must specify at least one file to add"
-msgstr ""
+msgstr "Du skal specificere mindst en fil at tilføje"
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:427
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:329
 msgid ""
 "%prog remove ids\n"
 "\n"
@@ -8032,12 +9839,17 @@ msgid ""
 "separated list of id numbers (you can get id numbers by using the list "
 "command). For example, 23,34,57-85\n"
 msgstr ""
+"%prog remove ids\n"
+"\n"
+"Fjern bøgerne identificeret af ids fra databasen. ids skal være en "
+"kommasepareret id numbers-liste (du kan få id numbers ved at anvende list-"
+"kommandoen). For eksempel, 23,34,57-85\n"
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:442
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:344
 msgid "You must specify at least one book to remove"
-msgstr ""
+msgstr "Du skal specificere mindst en bog der skal fjernes"
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:461
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:363
 msgid ""
 "%prog add_format [options] id ebook_file\n"
 "\n"
@@ -8045,16 +9857,21 @@ msgid ""
 "identified by id. You can get id by using the list command. If the format "
 "already exists, it is replaced.\n"
 msgstr ""
+"%prog add_format [options] id ebog_fil\n"
+"\n"
+"Tilføj e-bogen i ebog_fil til de tilgængelige formater for den logiske bog "
+"identificeret ved id. Du kan få id ved at anvende list-kommandoen. Hvis "
+"formatet allerede eksisterer, bliver det overskrevet.\n"
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:476
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:378
 msgid "You must specify an id and an ebook file"
-msgstr ""
+msgstr "Du skal specificere en id og en e-bog-fil"
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:481
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:383
 msgid "ebook file must have an extension"
-msgstr ""
+msgstr "E-bog-filen skal have en filendelse"
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:489
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:391
 msgid ""
 "\n"
 "%prog remove_format [options] id fmt\n"
@@ -8063,12 +9880,19 @@ msgid ""
 "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 ""
+"\n"
+"%prog remove_format [options] id fmt\n"
+"\n"
+"Fjern formatet fmt fra den logiske bog identificeret ved id. Du kan få id "
+"ved at anvende list-kommandoen. fmt skal være en filendelse ligesom LRF "
+"eller TXT eller EPUB. Hvis den logiske bog ikke har fmt tilgængelig, gøres "
+"intet.\n"
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:506
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:408
 msgid "You must specify an id and a format"
-msgstr ""
+msgstr "Du skal specificere en id og et format"
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:524
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:426
 msgid ""
 "\n"
 "%prog show_metadata [options] id\n"
@@ -8077,16 +9901,21 @@ msgid ""
 "id.\n"
 "id is an id number from the list command.\n"
 msgstr ""
+"\n"
+"%prog show_metadata [options] id\n"
+"\n"
+"Vis metadataene gemt i calibre-databasen for bogen identificeret ved id.\n"
+"id er et id number fra list-kommandoen.\n"
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:532
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:434
 msgid "Print metadata in OPF form (XML)"
-msgstr ""
+msgstr "Udskriv metadata i OPF-form (XML)"
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:541
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:443
 msgid "You must specify an id"
-msgstr ""
+msgstr "Du skal specificere en id"
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:554
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:456
 msgid ""
 "\n"
 "%prog set_metadata [options] id /path/to/metadata.opf\n"
@@ -8098,12 +9927,20 @@ msgid ""
 "can get a quick feel for the OPF format by using the --as-opf switch to the\n"
 "show_metadata command.\n"
 msgstr ""
+"\n"
+"%prog set_metadata [options] id /sti/til/metadata.opf\n"
+"\n"
+"Angiv metadataene gemt i calibre-databasen for bogen identificeret ved id\n"
+"fra OPF-fil metadata.opf. id er et id number fra list-kommandoen. Du\n"
+"kan få en hurtig føling med OPF-formatet ved at anvende --as-opf switchen "
+"til\n"
+"show_metadata-kommandoen.\n"
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:570
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:472
 msgid "You must specify an id and a metadata file"
-msgstr ""
+msgstr "Du skal specificere en id og en metadata-fil"
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:590
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:492
 msgid ""
 "%prog export [options] ids\n"
 "\n"
@@ -8113,28 +9950,34 @@ msgid ""
 "(in\n"
 "an opf file). You can get id numbers from the list command.\n"
 msgstr ""
+"%prog export [options] ids\n"
+"\n"
+"Eksport bøgerne specificeret ved ids (en kommasepareret liste) til "
+"filesystemet.\n"
+"Eksport operationen gemmer alle bogens formater, dets omslag og metadata (i\n"
+"en opf-fil). Du kan få id numbers fra list-kommandoen.\n"
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:598
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:500
 msgid "Export all books in database, ignoring the list of ids."
 msgstr "Eksporter alle bøger i databasen, listen over id'er ignoreres."
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:600
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:502
 msgid "Export books to the specified directory. Default is"
-msgstr "Eksporter bøger til den angivne mappe. Standardmappen er"
+msgstr "Eksportér bøger til den angivne mappe. Standardmappen er"
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:602
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:504
 msgid "Export all books into a single directory"
-msgstr "Eksporter alle bøger til en enkelt mappe"
+msgstr "Eksportér alle bøger til en enkelt mappe"
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:609
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:511
 msgid "Specifying this switch will turn this behavior off."
-msgstr ""
+msgstr "Specificering af denne switch vil slå denne opførsel fra."
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:632
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:534
 msgid "You must specify some ids or the %s option"
-msgstr "Du skal angive nogle id'er eller %s valgmuligheden"
+msgstr "Du skal specificere nogle ids eller %s valget"
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:645
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:547
 msgid ""
 "%prog add_custom_column [options] label name datatype\n"
 "\n"
@@ -8144,24 +9987,34 @@ msgid ""
 "column.\n"
 "datatype is one of: {0}\n"
 msgstr ""
+"%prog add_custom_column [options] label navn datatype\n"
+"\n"
+"Opret en brugerdefineret kolonne. label er et maskinvenligt kolonnenavn. Må "
+"ikke\n"
+"indeholde mellemrum eller koloner. name er det menneskevenlige kolonnenavn.\n"
+"datatype er en af: {0}\n"
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:654
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:556
 msgid ""
 "This column stores tag like data (i.e. multiple comma separated values). "
 "Only applies if datatype is text."
 msgstr ""
+"Denne kolonne gemmer mærkater ligesom data (f.eks. multiple kommaseparerede "
+"værdier). Giver kun mening hvis datatypen er tekst."
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:658
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:560
 msgid ""
 "A dictionary of options to customize how the data in this column will be "
 "interpreted."
 msgstr ""
+"En ordbog af valg til at brugerdefinere, hvordan dataene i denne kolonne vil "
+"blive fortolket."
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:671
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:573
 msgid "You must specify label, name and datatype"
-msgstr ""
+msgstr "Du skal specificere label, name og datatype"
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:729
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:631
 msgid ""
 "\n"
 "    %prog catalog /path/to/destination.(csv|epub|mobi|xml ...) [options]\n"
@@ -8171,31 +10024,44 @@ msgid ""
 "ouput.\n"
 "    "
 msgstr ""
+"\n"
+"    %prog catalog /path/to/destination.(csv|epub|mobi|xml ...) [valg]\n"
+"\n"
+"    Eksport et katalog i formatet specificeret ved sti/til/destination "
+"filendelse.\n"
+"    Valg styrer hvordan indgange vises i den genererede katalog-output.\n"
+"    "
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:743
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:645
 msgid ""
 "Comma-separated list of database IDs to catalog.\n"
 "If declared, --search is ignored.\n"
 "Default: all"
 msgstr ""
+"Kommasepareret liste af database IDs til kataloget.\n"
+"Hvis erklæret, --search bliver ignoreret.\n"
+"Standard: all"
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:747
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:649
 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.\n"
 "Default: no filtering"
 msgstr ""
+"Filtrér resultatet med søgeforespørgsel. Vedrørende formatet for "
+"søgeforespørgsel, venligst se søgerelateret dokumentation i brugermanualen.\n"
+"Standard: Ingen filtrering"
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:753
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:655
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:505
 msgid "Show detailed output information. Useful for debugging"
-msgstr "Vis detaljeret output information. Nyttig til fejlfinding"
+msgstr "Vis detaljeret output-information. Anvendeligt ved fejlfinding"
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:766
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:668
 msgid "Error: You must specify a catalog output file"
-msgstr ""
+msgstr "Fejl: Du skal specificere en katalog output-fil"
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:786
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:710
 msgid ""
 "\n"
 "    %prog set_custom [options] column id value\n"
@@ -8206,18 +10072,30 @@ msgid ""
 "    command.\n"
 "    "
 msgstr ""
+"\n"
+"    %prog set_custom [options] column id value\n"
+"\n"
+"    Angiv værdien af en brugerdefineret kolonne for bogen identificeret ved "
+"id.\n"
+"    Du kan få et en liste af ids ved at anvende list-kommandoen.\n"
+"    Du kan få en liste af brugerdefinerede kolonne navne ved at anvende "
+"custom_columns\n"
+"    -kommandoen.\n"
+"    "
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:797
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:721
 msgid ""
 "If the column stores multiple values, append the specified values to the "
 "existing ones, instead of replacing them."
 msgstr ""
+"Hvis kolonnen gemmer multiple værdier, tilføjes de specificerede værdier til "
+"de eksisterende, istedet for at overskrive dem."
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:808
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:732
 msgid "Error: You must specify a field name, id and value"
-msgstr ""
+msgstr "Fejl: Du skal specificere et feltnavn, id og value"
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:827
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:751
 msgid ""
 "\n"
 "    %prog custom_columns [options]\n"
@@ -8225,20 +10103,26 @@ msgid ""
 "    List available custom columns. Shows column labels and ids.\n"
 "    "
 msgstr ""
+"\n"
+"    %prog custom_columns [options]\n"
+"\n"
+"    Liste tilgængelige brugerdefinerede kolonne. Viser kolonne labels og "
+"ids.\n"
+"    "
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:834
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:758
 msgid "Show details for each column."
-msgstr ""
+msgstr "Vis detaljer for hver kolonner."
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:846
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:770
 msgid "You will lose all data in the column: %r. Are you sure (y/n)? "
-msgstr ""
+msgstr "Du vil miste alle data i kolonnen: %r. Er du sikker (y/n)? "
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:848
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:772
 msgid "y"
-msgstr ""
+msgstr "y"
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:854
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:778
 msgid ""
 "\n"
 "    %prog remove_custom_column [options] label\n"
@@ -8247,16 +10131,23 @@ msgid ""
 "    columns with the custom_columns command.\n"
 "    "
 msgstr ""
+"\n"
+"    %prog remove_custom_column [options] label\n"
+"\n"
+"    Fjern den brugerdefinerede kolonne identificeret ved label. Du kan se "
+"tilgængelige\n"
+"    kolonner med custom_columns-kommandoen.\n"
+"    "
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:862
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:786
 msgid "Do not ask for confirmation"
-msgstr ""
+msgstr "Spørger/spørg ikke efter bekræftelse"
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:872
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:796
 msgid "Error: You must specify a column label"
-msgstr ""
+msgstr "Fejl: Du skal specificere en kolonne label"
 
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:885
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:809
 msgid ""
 "%%prog command [options] [arguments]\n"
 "\n"
@@ -8269,116 +10160,148 @@ msgid ""
 msgstr ""
 "%%prog kommando [valgmuligheder] [argumenter]\n"
 "\n"
-"%%prog er kommandolinegrænsefladen til calibres bogdatabase.\n"
+"%%prog er kommandolinjegrænsefladen til calibres bogdatabase.\n"
 "\n"
 "kommando er en af følgende:\n"
 "  %s\n"
 "\n"
 "For hjælp om de enkelte kommandoer: %%prog kommando --help\n"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1261
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:70
+msgid "%sAverage rating is %3.1f"
+msgstr "%sMiddel vurderingen er %3.1f"
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:545
+msgid "Main"
+msgstr "Main/hjem/primær"
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:547
+msgid "Card A"
+msgstr "Kort A"
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:549
+msgid "Card B"
+msgstr "Kort B"
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1770
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr "<p>Flytter gammel database til e-bogsbibliotek i %s<br><center>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1290
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1799
 msgid "Copying <b>%s</b>"
 msgstr "Kopierer <b>%s</b>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1307
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1816
 msgid "Compacting database"
 msgstr "Komprimerer database"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1400
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1909
 msgid "Checking SQL integrity..."
-msgstr ""
+msgstr "Checker SQL integritet..."
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1438
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1950
 msgid "Checking for missing files."
-msgstr ""
+msgstr "Checker for manglende filer."
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1460
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1972
 msgid "Checked id"
-msgstr ""
+msgstr "Checket id"
+
+#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:118
+msgid "Ratings"
+msgstr "Vurderinger"
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:24
 msgid "The title"
-msgstr ""
+msgstr "Titlen"
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:25
 msgid "The authors"
-msgstr ""
+msgstr "Forfatterne"
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:26
 msgid ""
 "The author sort string. To use only the first letter of the name use "
 "{author_sort[0]}"
 msgstr ""
+"Forfatter sorteringsstrengen. For kun at anvende første bogstav af navnet, "
+"brug {author_sort[0]}"
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:28
 msgid "The tags"
-msgstr ""
+msgstr "Mærkaterne"
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:29
 msgid "The series"
-msgstr ""
+msgstr "Serierne"
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:30
 msgid ""
 "The series number. To get leading zeros use {series_index:0>3s} or "
 "{series_index:>3s} for leading spaces"
 msgstr ""
+"Seriens nummer. For at få foranstillede nuller brug {series_index:0>3s} "
+"eller {series_index:>3s} for foranstillede mellemrum"
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:33
 msgid "The rating"
-msgstr ""
+msgstr "Vurderingen"
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:34
 msgid "The ISBN"
-msgstr ""
+msgstr "ISBN"
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:35
 msgid "The publisher"
-msgstr ""
+msgstr "Forlaget"
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:36
 msgid "The date"
-msgstr ""
+msgstr "Datoen"
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:37
 msgid "The published date"
-msgstr ""
+msgstr "Publiseringsdatoen"
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:38
 msgid "The calibre internal id"
-msgstr ""
+msgstr "Calibre intern id"
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:48
 msgid "Options to control saving to disk"
-msgstr ""
+msgstr "Valg til at styre gem-til-disk"
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:54
 msgid ""
 "Normally, calibre will update the metadata in the saved files from what is "
 "in the calibre library. Makes saving to disk slower."
 msgstr ""
+"Normalt vil calibre opdatere metadataene i de gemte filer fra hvad der er i "
+"calibre-biblioteket. Gør gem-til-disk langsommere."
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:57
 msgid ""
 "Normally, calibre will write the metadata into a separate OPF file along "
 "with the actual e-book files."
 msgstr ""
+"Normalt, vil calibre skrive metadataene til en separat OPF-fil sammen med de "
+"aktuelle e-bog-filer."
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:60
 msgid ""
 "Normally, calibre will save the cover in a separate file along with the "
 "actual e-book file(s)."
 msgstr ""
+"Normalt, vil calibre gemme omslaget i en separat fil sammen med den aktuelle "
+"e-bogfil(er)."
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:63
 msgid ""
 "Comma separated list of formats to save for each book. By default all "
 "available books are saved."
 msgstr ""
+"Kommasepareret format-liste som gemmes for hver bog. Som standard gemmes "
+"alle tilgængelige bøger."
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:66
 msgid ""
@@ -8387,6 +10310,9 @@ msgid ""
 "subdirectory with filenames containing title and author. Available controls "
 "are: {%s}"
 msgstr ""
+"Skabelonen til at styre filnavne og mappestrukturer for de gemte filer. "
+"Standard er \"%s\" som vil gemme bøgerne i en per-forfatter undermappe med "
+"filnavne indeholdende titel og forfatter. Tilgængelige valg er: {%s}"
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:71
 msgid ""
@@ -8395,6 +10321,10 @@ msgid ""
 "directory with filenames containing title and author. Available controls "
 "are: {%s}"
 msgstr ""
+"Skabelonen til at styre filnavne og mappestrukturer af filer gemt på "
+"enheden. Standard er \"%s\" som vil gemme bøgerne i en per-forfatter "
+"undermappe med filnavne indeholdende titel og forfatter. Tilgængelige valg "
+"er: {%s}"
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:78
 msgid ""
@@ -8403,46 +10333,140 @@ msgid ""
 "experience errors when saving, depending on how well the filesystem you are "
 "saving to supports unicode."
 msgstr ""
+"Normalt vil calibre konvertere alle ikke-engelske bogstaver til engelske "
+"ækvivalenter for filnavnene. ADVARSEL: Hvis du slår dette fra, vil du nok "
+"opleve fejl under gemning, afhængig af hvor godt filsystemet du gemmer i, "
+"understøtter unicode."
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:84
 msgid ""
 "The format in which to display dates. %d - day, %b - month, %Y - year. "
 "Default is: %b, %Y"
 msgstr ""
+"Formatet i hvilket datoer vises i. %d - dag, %b - måned, %Y - år. Standard "
+"er: %b, %Y"
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:87
 msgid "Convert paths to lowercase."
-msgstr ""
+msgstr "Konvertér stier til småbogstaver."
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:89
 msgid "Replace whitespace with underscores."
-msgstr ""
+msgstr "Udskift blanktegn med bundstreger."
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:258
 msgid "Requested formats not available"
-msgstr ""
+msgstr "Ønskede formater ikke tilgængelig"
 
-#: /home/kovid/work/calibre/src/calibre/library/server.py:379
+#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:21
+msgid "Settings to control the calibre content server"
+msgstr "Indstillinger til at styre calibre indholdsserver"
+
+#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:25
+msgid "The port on which to listen. Default is %default"
+msgstr "Ip-porten på hvilken der skal lyttes. Standard er %default"
+
+#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:27
+msgid "The server timeout in seconds. Default is %default"
+msgstr "Server timeout i sekunder. Standard er %default"
+
+#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:29
+msgid "The max number of worker threads to use. Default is %default"
+msgstr "Maksimalt antal brugte arbejdstråde. Standard er %default"
+
+#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:31
+msgid "Set a password to restrict access. By default access is unrestricted."
+msgstr ""
+"Angiv en adgangskode til at begrænse adgang. Som standard er adgang uden "
+"angivet adgangskode ubegrænset."
+
+#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:33
+msgid "Username for access. By default, it is: %default"
+msgstr "Brugernavn for adgang. Som standard, er det: %default"
+
+#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:37
+msgid "The maximum size for displayed covers. Default is %default."
+msgstr "Maksimalstørrelse for viste omslag. Standard er %default."
+
+#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:39
+msgid ""
+"The maximum number of matches to return per OPDS query. This affects Stanza, "
+"WordPlayer, etc. integration."
+msgstr ""
+"Det maksimale antal af match at returnere per OPDS-forespørgsel. Det "
+"påvirker Stanza, WordPlayer, osv. integration."
+
+#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:43
+msgid ""
+"Group items in categories such as author/tags by first letter when there are "
+"more than this number of items. Default: %default. Set to a large number to "
+"disable grouping."
+msgstr ""
+"Gruppér emner i kategorier, såsom forfatter/mærkat efter første bogstav, når "
+"der er mere end dette antal emner. Standard: %default. Angiv et stort tal "
+"for at deaktivere gruppering."
+
+#: /home/kovid/work/calibre/src/calibre/library/server/base.py:93
 msgid "Password to access your calibre library. Username is "
 msgstr "Adgangskode til dit calibre bibliotek. Brugernavnet er "
 
-#: /home/kovid/work/calibre/src/calibre/library/server.py:886
+#: /home/kovid/work/calibre/src/calibre/library/server/main.py:28
 msgid ""
 "[options]\n"
 "\n"
 "Start the calibre content server."
 msgstr ""
-"[valgmuligheder]\n"
+"[options]\n"
 "\n"
 "Start calibre indholdsserveren."
 
-#: /home/kovid/work/calibre/src/calibre/library/server.py:888
+#: /home/kovid/work/calibre/src/calibre/library/server/main.py:30
 msgid "Path to the library folder to serve with the content server"
-msgstr ""
+msgstr "Sti til biblioteksmappen til at dele med indholdsserveren"
 
-#: /home/kovid/work/calibre/src/calibre/library/server.py:890
+#: /home/kovid/work/calibre/src/calibre/library/server/main.py:32
 msgid "Write process PID to the specified file"
-msgstr ""
+msgstr "Udskriv proces PID til den specificerede fill"
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:108
+msgid "%d books"
+msgstr "%d bøger"
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:127
+msgid "%d items"
+msgstr "%d emner"
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:144
+msgid "RATING: %s<br />"
+msgstr "VURDERING: %s<br />"
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:147
+msgid "TAGS: %s<br />"
+msgstr "MÆRKATER: %s<br />"
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:151
+msgid "SERIES: %s [%s]<br />"
+msgstr "SERIER: %s [%s]<br />"
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:192
+msgid "Library"
+msgstr "Bibliotek"
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:231
+msgid "Books in your library"
+msgstr "Bøger i dit bibliotek"
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:237
+msgid "By "
+msgstr "Af/efter "
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:238
+msgid "Books sorted by "
+msgstr "Bøger sorteret efter "
+
+#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
+msgid "Newest"
+msgstr "Nyeste"
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:48
 msgid "%sUsage%s: %s\n"
@@ -8457,94 +10481,104 @@ msgid ""
 "Whenever you pass arguments to %prog that have spaces in them, enclose the "
 "arguments in quotation marks."
 msgstr ""
+"Når du giver argumenter til %prog som har mellemrum i sig, skal du omslutte "
+"argumenterne i anførselstegn."
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:650
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:670
 msgid "Path to the database in which books are stored"
 msgstr "Sti til databasen, bøgerne er gemt i."
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:652
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:672
 msgid "Pattern to guess metadata from filenames"
-msgstr ""
+msgstr "Mønster til at gætte metadata fra filenavne"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:654
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:674
 msgid "Access key for isbndb.com"
-msgstr "Adgangsnøgle for isbndb.com"
+msgstr "Adgangsnøgle til isbndb.com"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:656
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:676
 msgid "Default timeout for network operations (seconds)"
 msgstr "Standard timeout for netværksoperationer (sekunder)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:658
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:678
 msgid "Path to directory in which your library of books is stored"
-msgstr "Sti til mappen dit bibliotek ligger i"
+msgstr "Sti til mappen dit bogbibliotek ligger i"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:660
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:680
 msgid "The language in which to display the user interface"
-msgstr ""
+msgstr "Sproget brugergrænsefladen skal vises i"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:662
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:682
 msgid "The default output format for ebook conversions."
-msgstr ""
+msgstr "Standard output-format for ebogskonverteringer."
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:666
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:686
 msgid "Ordered list of formats to prefer for input."
-msgstr ""
+msgstr "Ordnet formatliste der foretrækkes som input."
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:668
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:688
 msgid "Read metadata from files"
 msgstr "Indlæs metadata fra filer"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:670
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:690
 msgid "The priority of worker processes"
 msgstr "Arbejdsprocessernes prioritet"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:672
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:692
 msgid "Swap author first and last names when reading metadata"
-msgstr ""
+msgstr "Ombyt forfatters fornavn og efternavn når metadata læses"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:674
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:694
 msgid "Add new formats to existing book records"
-msgstr ""
+msgstr "Tilføj nye formater til eksisterende bogposter"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:678
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:699
 msgid "List of named saved searches"
-msgstr ""
+msgstr "Liste af navne gemte søgninger"
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:700
+msgid "User-created tag browser categories"
+msgstr "Brugeroprettede mærkat-browser kategorier"
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:702
+msgid "How and when calibre updates metadata on the device."
+msgstr "Hvordan og hvornår calibre opdaterer metadata på enheden."
 
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:43
 msgid "Waiting..."
-msgstr ""
+msgstr "Venter..."
 
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:51
 msgid "Stopped"
-msgstr ""
+msgstr "Stoppet"
 
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
 msgid "Finished"
-msgstr ""
+msgstr "Afsluttet"
 
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:75
 msgid "Working..."
-msgstr ""
+msgstr "Arbejder..."
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:93
 msgid "Brazilian Portuguese"
-msgstr ""
+msgstr "Brasiliansk-portugisisk"
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:94
 msgid "English (UK)"
-msgstr ""
+msgstr "Engelsk (Storbritannien)"
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:95
 msgid "Simplified Chinese"
-msgstr ""
+msgstr "Forenklet kinesisk"
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:96
 msgid "Chinese (HK)"
-msgstr ""
+msgstr "Kinesisk (HK)"
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:97
 msgid "Traditional Chinese"
-msgstr ""
+msgstr "Traditionelt kinesisk"
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:98
 msgid "English"
@@ -8552,67 +10586,71 @@ msgstr "Engelsk"
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:99
 msgid "English (Australia)"
-msgstr ""
+msgstr "Engelsk (Australien)"
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:100
 msgid "English (New Zealand)"
-msgstr ""
+msgstr "Engelsk (New Zealand)"
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:101
 msgid "English (Canada)"
-msgstr ""
+msgstr "Engelsk (Canada)"
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:102
 msgid "English (India)"
-msgstr ""
+msgstr "Engelsk (Indien)"
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:103
 msgid "English (Thailand)"
-msgstr ""
+msgstr "Engelsk (Thailand)"
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:104
 msgid "English (Cyprus)"
-msgstr ""
+msgstr "Engelsk (Cypern)"
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:105
 msgid "English (Pakistan)"
-msgstr ""
+msgstr "Engelsk (Pakistan)"
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:106
-msgid "English (Singapore)"
-msgstr ""
+msgid "English (Israel)"
+msgstr "Engelsk (Israel)"
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:107
-msgid "English (Yemen)"
-msgstr ""
+msgid "English (Singapore)"
+msgstr "Engelsk (Singapore)"
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:108
-msgid "English (Ireland)"
-msgstr ""
+msgid "English (Yemen)"
+msgstr "Engelsk (Yemen)"
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:109
-msgid "English (China)"
-msgstr ""
+msgid "English (Ireland)"
+msgstr "Engelsk (Irland)"
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:110
-msgid "Spanish (Paraguay)"
-msgstr ""
+msgid "English (China)"
+msgstr "Engelsk (Kina)"
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:111
-msgid "German (AT)"
-msgstr ""
+msgid "Spanish (Paraguay)"
+msgstr "Spansk (Paraguay)"
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:112
-msgid "Dutch (NL)"
-msgstr ""
+msgid "German (AT)"
+msgstr "Tysk (AT)"
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:113
+msgid "Dutch (NL)"
+msgstr "Hollansk (NL)"
+
+#: /home/kovid/work/calibre/src/calibre/utils/localization.py:114
 msgid "Dutch (BE)"
-msgstr ""
+msgstr "Hollansk (BE)"
 
 #: /home/kovid/work/calibre/src/calibre/utils/sftp.py:53
 msgid "URL must have the scheme sftp"
-msgstr ""
+msgstr "URL skal have skemaet sftp"
 
 #: /home/kovid/work/calibre/src/calibre/utils/sftp.py:57
 msgid "host must be of the form user@hostname"
@@ -8620,29 +10658,29 @@ msgstr "vært skal være i formen bruger@værtsnavn"
 
 #: /home/kovid/work/calibre/src/calibre/utils/sftp.py:68
 msgid "Failed to negotiate SSH session: "
-msgstr ""
+msgstr "SSH-sessionsforhandling fejlede: "
 
 #: /home/kovid/work/calibre/src/calibre/utils/sftp.py:71
 msgid "Failed to authenticate with server: %s"
-msgstr ""
+msgstr "autentificering med server fejlede: %s"
 
 #: /home/kovid/work/calibre/src/calibre/utils/smtp.py:234
 msgid "Control email delivery"
-msgstr ""
+msgstr "Styre e-mail levering"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:113
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:135
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:118
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:140
 msgid "Unknown feed"
 msgstr "Ukendt feed"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:153
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:178
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:158
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:183
 msgid "Untitled article"
 msgstr "Unavngiven artikel"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/input.py:21
 msgid "Download periodical content from the internet"
-msgstr ""
+msgstr "Download tidsskrift indholdet fra internettet"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/input.py:36
 msgid ""
@@ -8655,113 +10693,120 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/web/feeds/input.py:39
 msgid "Username for sites that require a login to access content."
 msgstr ""
-"Brugernavn for sider, der kræver et login for at få adgang til indholdet"
+"Brugernavn for sites, der kræver et login for at få adgang til indholdet."
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/input.py:42
 msgid "Password for sites that require a login to access content."
 msgstr ""
-"Adgangskode for sider, der kræver login for at få adgang til indholdet"
+"Adgangskode for sites, der kræver login for at få adgang til indholdet"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/input.py:46
 msgid ""
 "Do not download latest version of builtin recipes from the calibre server"
 msgstr ""
+"Download ikke den sidste version af de indbyggede opskrifter fra calibre-"
+"serveren"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:43
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:44
 msgid "Unknown News Source"
 msgstr "Ukendt nyhedskilde"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:565
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:608
 msgid "The \"%s\" recipe needs a username and password."
-msgstr ""
+msgstr "\"%s\"-opskriften kræver et brugernavn og adgangskode."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:654
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:708
 msgid "Download finished"
-msgstr "Download færdig"
+msgstr "Download afsluttet"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:656
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:710
 msgid "Failed to download the following articles:"
 msgstr "Kunne ikke downloade følgende artikler:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:662
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:716
 msgid "Failed to download parts of the following articles:"
 msgstr "Kunne ikke downloade dele af følgende artikler:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:664
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:718
 msgid " from "
 msgstr " fra "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:666
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:720
 msgid "\tFailed links:"
-msgstr "\tMislykkede links:"
+msgstr "\tMislykkede henvisninger:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:809
 msgid "Could not fetch article. Run with -vv to see the reason"
-msgstr ""
+msgstr "Kunne ikke hente artikler. Kør med -vv for at se årsagen"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:768
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:830
 msgid "Fetching feeds..."
 msgstr "Henter feeds..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:773
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:835
 msgid "Got feeds from index page"
 msgstr "Fik feeds fra indekssiden"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:779
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:841
 msgid "Trying to download cover..."
 msgstr "Prøver at downloade omslag..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:781
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Generating masthead..."
-msgstr ""
+msgstr "Genererer masthead..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:861
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:924
 msgid "Starting download [%d thread(s)]..."
 msgstr "Starter download [%d tråd(e)]..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:877
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:940
 msgid "Feeds downloaded to %s"
 msgstr "Feeds er hentet til %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:887
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:950
 msgid "Could not download cover: %s"
 msgstr "Kunne ikke hente omslaget: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:899
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
 msgid "Downloading cover from %s"
 msgstr "Downloader omslag fra %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:934
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1002
 msgid "Masthead image downloaded"
-msgstr ""
+msgstr "Masthead billede downloadet"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1158
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1192
 msgid "Untitled Article"
 msgstr "Unavngiven artikel"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1230
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1263
 msgid "Article downloaded: %s"
 msgstr "Artikel hentet: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1241
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1274
 msgid "Article download failed: %s"
 msgstr "Hentning af artikel mislykkedes: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1258
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1291
 msgid "Fetching feed"
 msgstr "Henter feed"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1405
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1438
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
 msgstr ""
+"Login mislykkedes, check dit brugernavn og adgangskode til calibre "
+"tidsskriftsservice."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1421
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1454
 msgid ""
 "You do not have permission to download this issue. Either your subscription "
 "has expired or you have exceeded the maximum allowed downloads for today."
 msgstr ""
+"Du har ikke tilladelse til at downloade denne udgave. Enten er dit "
+"abonnement udløbet eller du har overskredet det maksimale antal tilladte "
+"downloads for idag."
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/collection.py:47
 msgid "You"
@@ -8769,16 +10814,16 @@ msgstr "Du"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/model.py:73
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/model.py:82
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/model.py:181
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/model.py:183
 msgid "Scheduled"
 msgstr "Planlagt"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/model.py:84
-#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/model.py:182
+#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/model.py:184
 msgid "Custom"
 msgstr "Brugerdefineret"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:471
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:482
 msgid ""
 "%prog URL\n"
 "\n"
@@ -8786,60 +10831,62 @@ msgid ""
 msgstr ""
 "%prog URL\n"
 "\n"
-"Hvor URL er fx http://google.com"
+"Hvor URL er f.eks. http://google.com"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:474
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:485
 msgid "Base directory into which URL is saved. Default is %default"
 msgstr "Mappe hvortil URLen gemmes. Standardværdien er %default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:477
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:488
 msgid ""
 "Timeout in seconds to wait for a response from the server. Default: %default "
 "s"
 msgstr ""
+"Timeout i sekunder at vente, for et svar fra serveren. Standard: %default s"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:480
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:491
 msgid ""
 "Maximum number of levels to recurse i.e. depth of links to follow. Default "
 "%default"
 msgstr ""
-"Maksimalt rekursiv dybde til fx forfølgelse af links. Standardværdi %default"
+"Maksimalt rekursiv dybde til f.eks. forfølgelse af henvisninger. "
+"Standardværdi %default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:483
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494
 msgid ""
 "The maximum number of files to download. This only applies to files from <a "
 "href> tags. Default is %default"
 msgstr ""
-"Det maksimale antal filer til at hente. Dette gælder kun filer fra <a href> "
+"Det maksimale antal filer der hentes. Dette gælder kun filer fra <a href> "
 "tags. Standardværdien er %default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:485
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:496
 msgid ""
 "Minimum interval in seconds between consecutive fetches. Default is %default "
 "s"
 msgstr ""
-"Minimalt interval i sekunder mellem to hentninger, Standardværdien er "
-"%default s"
+"Minimalt interval i sekunder mellem hentninger, Standardværdien er %default s"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:487
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:498
 msgid ""
 "The character encoding for the websites you are trying to download. The "
 "default is to try and guess the encoding."
 msgstr ""
-"Tegnsættet for hjemmesiderne, du prøver at hente. Udgangspunktet er at "
+"Tegnsættet for hjemmeside sites, du prøver at hente. Udgangspunktet er at "
 "forsøge på at gætte tegnsættet."
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:489
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:500
 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 ""
-"Kun links der passer på dette regulære udtryk vil blive fulgt. Denne "
-"valgmulighed kan angives flere gange, hvor links vil blive fulgt, bare de "
-"passer på ét af udtrykkene. Som udgangspunkt følges alle links."
+"Kun henvisninger, der passer på dette regulære udtryk, vil blive fulgt. "
+"Denne valgmulighed kan angives flere gange, hvor henvisninger vil blive "
+"fulgt, bare de passer på ét af udtrykkene. Som udgangspunkt følges alle "
+"henvisninger."
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:491
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:502
 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 "
@@ -8847,15 +10894,15 @@ msgid ""
 "filter-regexp and --match-regexp are specified, then --filter-regexp is "
 "applied first."
 msgstr ""
-"Alle links der passer på dette regulære udtryk vil blive ignoreret. Denne "
-"valgmulighed kan angives flere gange, hvor links vil blive ignoreret, bare "
-"de passer på ét af udtrykkene. Som udgangspunkt ignoreres ingen links. Hvis "
-"både --filter-regexp og --match-regexp er angivet vil --filter-regexp blive "
-"anvendt først."
+"Alle henvisninger, der passer på dette regulære udtryk, vil blive ignoreret. "
+"Denne valgmulighed kan angives flere gange, hvor henvisninger vil blive "
+"ignoreret, bare de passer på ét af udtrykkene. Som udgangspunkt ignoreres "
+"ingen henvisninger. Hvis både --filter-regexp og --match-regexp er angivet, "
+"vil --filter-regexp blive anvendt først."
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:493
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:504
 msgid "Do not download CSS stylesheets."
-msgstr "Download ikke CSS stilark"
+msgstr "Download ikke CSS-stilark"
 
 #~ msgid "Options to control the conversion to EPUB"
 #~ msgstr "Indstillinger for konvertering til EPUB"
@@ -10042,6 +12089,37 @@ msgstr "Download ikke CSS stilark"
 #~ msgid "Hungarian"
 #~ msgstr "Ungarsk"
 
+#~ msgid "Device database corrupted"
+#~ msgstr "Enheds database korrumperet"
+
+#~ 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 ""
+#~ "\n"
+#~ "                <p>Bog-databasen på enheden er korrumperet. Forsøg "
+#~ "følgende:\n"
+#~ "                <ol>\n"
+#~ "                <li>Afbryd forbindelsen til enheden.  Vent indtil enheden "
+#~ "færdiggør regenerering af databasen (dvs. vent til den er klar til brug). "
+#~ "Forbind enheden igen. Nu burde den virke med %(app)s. Hvis ikke, forsøg da "
+#~ "næste trin.</li>\n"
+#~ "                <li>Afslut %(app)s. Find filen media.xml på enheden. Slet "
+#~ "den. Afbryd forbindelsen til enheden.  Vent indtil enheden færdiggør "
+#~ "regenerering af filen. Forbind enheden igen og start %(app)s.</li>\n"
+#~ "                <ol>\n"
+#~ "                "
+
 #~ msgid "Communicate with the Cybook Gen 3 eBook reader."
 #~ msgstr "Kommuniker med Cybook Gen 3 e-bogslæseren."
 
diff --git a/src/calibre/translations/de.po b/src/calibre/translations/de.po
index 36dbf8bd84..710b4fce62 100644
--- a/src/calibre/translations/de.po
+++ b/src/calibre/translations/de.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-03 01:21+0000\n"
-"PO-Revision-Date: 2010-07-06 12:31+0000\n"
-"Last-Translator: MS <Unknown>\n"
+"POT-Creation-Date: 2010-07-09 22:00+0000\n"
+"PO-Revision-Date: 2010-07-09 20:33+0000\n"
+"Last-Translator: Kovid Goyal <Unknown>\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: 2010-07-07 03:37+0000\n"
+"X-Launchpad-Export-Date: 2010-07-10 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Generated-By: pygettext.py 1.5\n"
 
@@ -28,10 +28,10 @@ msgstr "Macht absolut gar nichts"
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:71
 #: /home/kovid/work/calibre/src/calibre/devices/prs500/books.py:267
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:466
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:492
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:396
-#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:98
-#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:101
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:97
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:100
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/metadata.py:56
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:428
 #: /home/kovid/work/calibre/src/calibre/ebooks/fb2/input.py:67
@@ -73,9 +73,9 @@ msgstr "Macht absolut gar nichts"
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:818
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:49
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:51
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:910
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:915
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:981
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:911
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:916
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:982
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:137
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:139
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:108
@@ -103,20 +103,20 @@ msgstr "Macht absolut gar nichts"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:233
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:290
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:815
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:818
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:814
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:817
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:172
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:179
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:22
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:135
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:903
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:912
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1192
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1195
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:898
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:907
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1190
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1193
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:120
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:155
@@ -124,8 +124,8 @@ msgstr "Macht absolut gar nichts"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:172
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:362
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:877
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1054
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:882
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1060
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:87
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:92
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:185
@@ -171,7 +171,7 @@ msgstr "Metadaten schreiben"
 msgid "Catalog generator"
 msgstr "Katalogerstellung"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:15
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:16
 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 "
@@ -181,7 +181,7 @@ msgstr ""
 "allen verlinkten Dateien erstellen. Dieses Plugin läuft immer, wenn sie eine "
 "HTML-Datei zur Bibliothek hinzufügen."
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:51
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:52
 msgid ""
 "Character encoding for the input HTML files. Common choices include: cp1252, "
 "latin1, iso-8859-1 and utf-8."
@@ -189,7 +189,7 @@ msgstr ""
 "Zeichenkodierung der Eingabe-HTML-Dateien. Üblicherweise ist das: cp1252, "
 "latin1, iso-8859-1 und utf-8."
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:58
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:59
 msgid ""
 "Create a PMLZ archive containing the PML file and all images in the "
 "directory pmlname_img or images. This plugin is run every time you add a PML "
@@ -199,49 +199,49 @@ msgstr ""
 "pmlname_img oder images. Dieses Plugin wird immer dann ausgeführt, wenn Sie "
 "eine PML-Datei zur Bibliothek hinzufügen."
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:90
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:93
 msgid "Extract cover from comic files"
 msgstr "Umschlagbild aus Comic-Dateien extrahieren"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:117
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:128
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:140
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:150
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:160
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:171
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:181
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:191
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:201
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:211
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:221
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:232
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:243
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:255
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:276
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:287
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:297
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:307
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:120
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:131
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:153
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:163
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:174
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:184
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:194
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:204
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:214
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:224
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:235
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:246
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:258
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:279
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:290
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:300
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:310
 msgid "Read metadata from %s files"
 msgstr "Metadaten aus %s Dateien lesen"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:266
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:269
 msgid "Read metadata from ebooks in RAR archives"
 msgstr "Metadaten von eBooks in RAR-Archiven lesen"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:318
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:321
 msgid "Read metadata from ebooks in ZIP archives"
 msgstr "Metadaten aus Büchern in ZIP-Archiven lesen"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:331
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:341
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:351
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:373
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:384
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:394
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:334
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:344
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:354
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:376
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:387
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:397
 msgid "Set metadata in %s files"
 msgstr "Geben Sie die Metadaten in %s-Dateien an"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:362
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:365
 msgid "Set metadata from %s files"
 msgstr "Geben Sie die Metadaten von %s-Dateien an"
 
@@ -401,35 +401,35 @@ msgstr ""
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr "Dieses Profil ist geeignet für den Amazon Kindle DX."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:31
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
 msgid "Installed plugins"
 msgstr "Installierte Plugins"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:33
 msgid "Mapping for filetype plugins"
 msgstr "Mapping für Dateityp-Plugins"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:33
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:34
 msgid "Local plugin customization"
 msgstr "Lokale Plugin-Anpassung"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:34
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
 msgid "Disabled plugins"
 msgstr "Ausgeschaltene Plugins"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
 msgid "Enabled plugins"
 msgstr "Aktivierte Module"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:83
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:84
 msgid "No valid plugin found in "
 msgstr "Kein gültiges Plugin gefunden in "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:460
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:468
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr "Starten des Plugins %s schlug fehl. Traceback:"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:493
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
 msgid ""
 "    %prog options\n"
 "\n"
@@ -441,19 +441,19 @@ msgstr ""
 "    Calibre anpassen durch das Laden externer Plugins.\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:499
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
 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:501
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 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:503
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:511
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
@@ -461,15 +461,15 @@ 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:505
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:513
 msgid "List all installed plugins"
 msgstr "Installierte Plugins auflisten"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Enable the named plugin"
 msgstr "Gewähltes Plugin einschalten"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Disable the named plugin"
 msgstr "Gewähltes Plugin ausschalten"
 
@@ -627,7 +627,7 @@ msgstr "Kommunikation mit Hanlin V5 eBook Readern."
 msgid "Communicate with the BOOX eBook reader."
 msgstr "Kommunikation mit dem BOOX eBook Reader."
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:121
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:123
 msgid ""
 "Comma separated list of directories to send e-books to on the device. The "
 "first one that exists will be used."
@@ -698,7 +698,7 @@ msgstr "Kommunikation mit dem Kobo Reader"
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:51
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:54
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:57
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:157
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:159
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:64
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:67
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:70
@@ -708,22 +708,22 @@ msgstr "Kommunikation mit dem Kobo Reader"
 msgid "Getting list of books on device..."
 msgstr "Die Liste der Bücher auf dem Gerät beziehen ..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:218
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:258
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:219
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:263
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:244
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:262
 msgid "Removing books from device..."
 msgstr "Bücher vom Gerät entfernen ..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:262
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:269
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:267
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:274
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:269
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:274
 msgid "Removing books from device metadata listing..."
 msgstr "Bücher von der Metadaten-Liste des Geräts entfernen ..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:274
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:308
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:313
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:208
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:238
 msgid "Adding books to device metadata listing..."
@@ -741,6 +741,10 @@ msgstr "Kommunikation mit dem Booq Avant"
 msgid "Communicate with the Sweex MM300"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/misc.py:75
+msgid "Communicate with the Pandigital Novel"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:17
 msgid "Communicate with the Nokia 770 internet tablet."
 msgstr "Kommunikation mit dem Nokia 770 Internet Tablet."
@@ -1685,6 +1689,51 @@ msgstr "Veränderungen am eBook durchführen ..."
 msgid "Creating"
 msgstr "Erstellen"
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/__init__.py:18
+msgid "ePub Fixer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/epubcheck.py:18
+msgid "Workaround epubcheck bugs"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/epubcheck.py:22
+msgid ""
+"Workarounds for bugs in the latest release of epubcheck. epubcheck reports "
+"many things as errors that are not actually errors. %prog will try to detect "
+"these and replace them with constructs that epubcheck likes. This may cause "
+"significant changes to your epub, complain to the epubcheck project."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:19
+msgid ""
+"%prog [options] file.epub\n"
+"\n"
+"Fix common problems in EPUB files that can cause them to be rejected by "
+"poorly designed publishing services.\n"
+"\n"
+"By default, no fixing is done and messages are printed out for each error "
+"detected. Use the options to control which errors are automatically fixed."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:50
+msgid "You must specify an epub file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:17
+msgid "Fix unmanifested files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:21
+msgid ""
+"Fix unmanifested files. %prog can either add them to the manifest or delete "
+"them as specified by the delete unmanifested option."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:32
+msgid "Delete unmanifested files instead of adding them to the manifest"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:56
 msgid ""
 "Extract the contents of the generated EPUB file to the specified directory. "
@@ -2060,11 +2109,11 @@ msgstr "Comic"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:98
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:882
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:887
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:543
 msgid "Title"
 msgstr "Titel"
@@ -2073,7 +2122,7 @@ msgstr "Titel"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:364
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:883
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:888
 msgid "Author(s)"
 msgstr "Autor(en)"
 
@@ -2096,7 +2145,7 @@ msgstr "Produzent"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:67
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:318
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1073
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1079
 msgid "Comments"
 msgstr "Bemerkung"
 
@@ -2105,7 +2154,7 @@ msgstr "Bemerkung"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:306
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1069
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1075
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:139
 msgid "Tags"
 msgstr "Etiketten (Tags)"
@@ -2115,7 +2164,7 @@ msgstr "Etiketten (Tags)"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:323
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1084
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:87
 msgid "Series"
 msgstr "Reihe"
@@ -2125,7 +2174,7 @@ msgid "Language"
 msgstr "Sprache"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:406
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1067
 msgid "Timestamp"
 msgstr "Zeitstempel"
 
@@ -2393,7 +2442,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1226
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1398
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1399
 msgid "Cover"
 msgstr "Umschlagbild"
 
@@ -2434,70 +2483,70 @@ msgstr "Alle Artikel"
 msgid "This is an Amazon Topaz book. It cannot be processed."
 msgstr "Dies ist ein Amazon Topaz-Buch. Es kann nicht verarbeitet werden."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1399
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1400
 msgid "Title Page"
 msgstr "Titelseite"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1400
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1401
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:15
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:53
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:194
 msgid "Table of Contents"
 msgstr "Inhaltsverzeichnis"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1401
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1402
 msgid "Index"
 msgstr "Index"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1402
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1403
 msgid "Glossary"
 msgstr "Glossar"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1403
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1404
 msgid "Acknowledgements"
 msgstr "Danksagung"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1404
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1405
 msgid "Bibliography"
 msgstr "Literaturverzeichnis"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1405
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1406
 msgid "Colophon"
 msgstr "Schlussschrift"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1406
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1407
 msgid "Copyright"
 msgstr "Copyright"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1407
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1408
 msgid "Dedication"
 msgstr "Widmung"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1408
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1409
 msgid "Epigraph"
 msgstr "Epigraph"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1409
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1410
 msgid "Foreword"
 msgstr "Vorwort"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1410
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1411
 msgid "List of Illustrations"
 msgstr "Abbildungsverzeichnis"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1411
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1412
 msgid "List of Tables"
 msgstr "Tabellenverzeichnis"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1412
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1413
 msgid "Notes"
 msgstr "Anmerkungen"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1413
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1414
 msgid "Preface"
 msgstr "Vorwort"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1414
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1415
 msgid "Main Text"
 msgstr "Haupttext"
 
@@ -2545,7 +2594,7 @@ msgstr "Seitenleiste"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:22
 #: /home/kovid/work/calibre/src/calibre/ebooks/tcr/input.py:23
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:23
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:24
 msgid ""
 "Normally calibre treats blank lines as paragraph markers. With this option "
 "it will assume that every line represents a paragraph instead."
@@ -2556,7 +2605,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:26
 #: /home/kovid/work/calibre/src/calibre/ebooks/tcr/input.py:27
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:27
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:28
 msgid ""
 "Normally calibre treats blank lines as paragraph markers. With this option "
 "it will assume that every line starting with an indent (either a tab or 2+ "
@@ -2726,7 +2775,7 @@ msgstr ""
 "Zeigt Informationen über das PDF an.\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
 msgid "Author"
 msgstr "Autor"
@@ -2904,7 +2953,7 @@ msgstr ""
 "wenig komprimiert, dafür aber schneller, und 10 bedeutet höchstkomprimiert, "
 "dafür aber langsamer."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:33
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:34
 msgid ""
 "Normally extra spaces are condensed into a single space. With this option "
 "all spaces will be displayed."
@@ -2912,7 +2961,7 @@ msgstr ""
 "Normalerweise werden extra Leerzeichen zu einem einzigen Leerzeichen "
 "zusammengeführt. Mit dieser Option werden alle Leerzeichen angezeigt."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:36
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:37
 msgid ""
 "Run the text input through the markdown pre-processor. To learn more about "
 "markdown see"
@@ -2920,7 +2969,7 @@ msgstr ""
 "Texteingabe durch die Markdown-Vorverarbeitung laufen lassen. Mehr über "
 "Markdown erfahren Sie unter"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:39
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:40
 msgid "Do not insert a Table of Contents into the output text."
 msgstr "Kein Inhaltsverzeichnis in den Ausgabetext einfügen."
 
@@ -3106,7 +3155,7 @@ msgstr "Kopieren"
 msgid "Copy to Clipboard"
 msgstr "In die Zwischenablage kopieren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:400
 msgid "Choose Files"
 msgstr "Dateien wählen"
 
@@ -3121,13 +3170,13 @@ msgid "User annotations generated from main library only"
 msgstr "Nur aus der Hauptbibliothek erstellte Benutzeranmerkungen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:75
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:612
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:671
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:708
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:729
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:877
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1060
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:670
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:707
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:728
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:876
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:941
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1059
 msgid "No books selected"
 msgstr "Keine Bücher ausgewählt"
 
@@ -3167,145 +3216,145 @@ msgstr "Wie viele leere Bücher?"
 msgid "How many empty books should be added?"
 msgstr "Wie viele leere Bücher sollen hinzugefügt werden?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:340
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:390
 msgid "Uploading books to device."
 msgstr "Lade Bücher auf das Gerät."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:350
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:137
 msgid "Books"
 msgstr "Bücher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
 msgid "EPUB Books"
 msgstr "EPUB Bücher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
 msgid "LRF Books"
 msgstr "LRF Bücher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
 msgid "HTML Books"
 msgstr "HTML Bücher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
 msgid "LIT Books"
 msgstr "LIT Bücher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
 msgid "MOBI Books"
 msgstr "MOBI Bücher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
 msgid "Topaz books"
 msgstr "Topaz Bücher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
 msgid "Text books"
 msgstr "Text Bücher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:359
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
 msgid "PDF Books"
 msgstr "PDF Bücher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:359
 msgid "Comics"
 msgstr "Comics"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:360
 msgid "Archives"
 msgstr "Archive"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:364
 msgid "Supported books"
 msgstr "Unterstützte Bücher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:399
 msgid "Merged some books"
 msgstr "Einige Bücher zusammenfügen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:401
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:400
 msgid ""
 "Some duplicates were found and merged into the following existing books:"
 msgstr ""
 "Es wurden einige Duplikate gefunden und mit den folgenden, schon vorhandenen "
 "Büchern zusammengefügt:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:409
 msgid "Failed to read metadata"
 msgstr "Lesen der Metadaten schlug fehl"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:410
 msgid "Failed to read metadata from the following"
 msgstr "Lesen der Metadaten schlug fehl bei folgenden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:434
 msgid "Add to library"
 msgstr "Zur Bibliothek hinzufügen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:460
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1229
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:459
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1228
 msgid "No book selected"
 msgstr "Kein Buch ausgewählt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:434
 msgid "No book files found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:456
 msgid "Cannot delete"
 msgstr "Löschen nicht möglich"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:469
 msgid "Choose formats to be deleted"
 msgstr "Zu löschende Formate auswählen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:488
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:487
 msgid "Choose formats <b>not</b> to be deleted"
 msgstr "<b>Nicht</b> zu löschende Formate auswählen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:507
 msgid "Cannot delete books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:509
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:508
 msgid "No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:519
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:518
 msgid "Main memory"
 msgstr "Hauptspeicher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:519
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:444
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:453
 msgid "Storage Card A"
 msgstr "Speicherkarte A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:521
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:520
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:446
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:455
 msgid "Storage Card B"
 msgstr "Speicherkarte B"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:525
 msgid "No books to delete"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:526
 msgid "None of the selected books are on the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:544
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:600
 msgid "Deleting books from device."
 msgstr "Lösche Bücher vom Gerät."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:564
 msgid ""
 "The selected books will be <b>permanently deleted</b> and the files removed "
 "from your computer. Are you sure?"
@@ -3313,7 +3362,7 @@ msgstr ""
 "Die gewählten Bücher werden <b>dauerhaft gelöscht</b> und die Dateien vom "
 "Computer entfernt. Sin Sie sicher?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:585
 msgid ""
 "The selected books will be <b>permanently deleted</b> from your device. Are "
 "you sure?"
@@ -3321,61 +3370,61 @@ msgstr ""
 "Die gewählten Bücher werden von ihrem Gerät <b>dauerhaft gelöscht</b>. Sind "
 "Sie sicher?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:610
 msgid "Cannot download metadata"
 msgstr "Konnte Metadaten nicht laden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:627
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
 msgid "social metadata"
 msgstr "soziale Metadaten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
 msgid "covers"
 msgstr "Umschlagbilder"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
 msgid "metadata"
 msgstr "Metadaten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:630
 msgid "Downloading %s for %d book(s)"
 msgstr "Lade %s für %d Bücher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:654
 msgid "Failed to download some metadata"
 msgstr "Das Laden der Metadaten schlug teilweise fehl"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:656
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
 msgid "Failed to download metadata for the following:"
 msgstr "Das Laden der Metadaten schlug für folgende Bücher fehl:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:659
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:658
 msgid "Failed to download metadata:"
 msgstr "Laden der Metadaten schlug fehl:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:660
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:659
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:637
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:522
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:949
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:951
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
 msgid "Error"
 msgstr "Fehler"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:670
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:707
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:669
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:706
 msgid "Cannot edit metadata"
 msgstr "Kann Metadaten nicht bearbeiten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:728
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:731
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:727
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:730
 msgid "Cannot merge books"
 msgstr "Konnte Bücher nicht zusammenfügen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:732
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:731
 msgid "At least two books must be selected for merging"
 msgstr "Es müssen wenigstens zwei Bücher zum Zusammenfügen ausgewählt werden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:736
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:735
 msgid ""
 "All book formats and metadata from the selected books will be added to the "
 "<b>first selected book.</b><br><br> The second and subsequently selected "
@@ -3387,7 +3436,7 @@ msgstr ""
 "Bücher werden nicht gelöscht oder verändert.<br><br>Zum Fortfahren bitte "
 "bestätigen."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:747
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:746
 msgid ""
 "All book formats and metadata from the selected books will be merged into "
 "the <b>first selected book</b>.<br><br>After merger the second and "
@@ -3403,7 +3452,7 @@ msgstr ""
 "zweiten und den danach gewählten Bücher werden unwiderruflich von Ihrem "
 "Rechner <b>gelöscht</b>.<br><br>  Wollen Sie <b>wirklich</b> fortfahren?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:759
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:758
 msgid ""
 "You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
 "proceed?"
@@ -3411,94 +3460,94 @@ msgstr ""
 "Sie versuchen mehr als 5 Bücher zusammenzufügen. Wollen Sie damit "
 "<b>wirklich</b> fortfahren?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:876
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:875
 msgid "Cannot save to disk"
 msgstr "Speichern auf Festplatte nicht möglich"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:878
 msgid "Choose destination directory"
 msgstr "Zielverzeichnis auswählen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:912
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:911
 msgid "Error while saving"
 msgstr "Fehler während des Speicherns"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:913
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:912
 msgid "There was an error while saving."
 msgstr "Es gab einen Fehler während des Speicherns."
 
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:919
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:920
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:921
 msgid "Could not save some books"
 msgstr "Konnte einige Bücher nicht speichern"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:922
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:921
 msgid "Click the show details button to see which ones."
 msgstr ""
 "Klicken Sie auf die Schaltfläche Details zeigen, um zu sehen, welche es gibt."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
 msgid "No books selected to generate catalog for"
 msgstr "Keine Bücher ausgewählt, für die ein Katalog erstellt werden soll"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:960
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:959
 msgid "Generating %s catalog..."
 msgstr "Erstelle %s Katalog..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:965
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:964
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:264
 msgid "No books found"
 msgstr "Keine Bücher gefunden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:966
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:965
 msgid ""
 "No books to catalog\n"
 "Check exclude tags"
 msgstr "Keine Bücher im Katalog. Bitte ausgeschlossene Etiketten prüfen."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:976
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:975
 msgid "Catalog generated."
 msgstr "Katalog erstellt."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:979
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:978
 msgid "Export Catalog Directory"
 msgstr "Katalog-Verzeichnis exportieren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:980
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:979
 msgid "Select destination for %s.%s"
 msgstr "Wählen Sie das Ziel für %s.%s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:996
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:995
 msgid "Fetching news from "
 msgstr "Rufe Nachrichten ab von "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1009
 msgid " fetched."
 msgstr " abgerufen."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1059
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1058
 msgid "Cannot convert"
 msgstr "Konvertierung nicht möglich"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1088
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1087
 msgid "Starting conversion of %d book(s)"
 msgstr "Starte Konvertierung von %d Büchern"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1265
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1264
 msgid "Cannot view"
 msgstr "Ansehen nicht möglich"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1209
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
 msgid "Choose the format to view"
 msgstr "Format zur Vorschau wählen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1218
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1217
 msgid "Multiple Books Selected"
 msgstr "Mehrere Bücher ausgewählt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1219
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1218
 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 "
@@ -3510,11 +3559,11 @@ msgstr ""
 "Rechners haben. Einmal gestartet kann der Prozess nicht beendet werden, "
 "bevor er abgeschlossen ist. Möchten Sie fortfahren?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1227
 msgid "Cannot open folder"
 msgstr "Konnte Verzeichnis nicht öffnen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1266
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1265
 msgid "%s has no available formats."
 msgstr "%s hat keine verfügbaren Formate."
 
@@ -3539,7 +3588,7 @@ msgid "The specified directory could not be processed."
 msgstr "Das angegebene Verzeichnis konnte nicht bearbeitet werden."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:845
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:840
 msgid "No books"
 msgstr "Keine Bücher"
 
@@ -3678,15 +3727,15 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:52
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:633
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:637
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:366
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:371
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:385
@@ -3710,12 +3759,12 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:265
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:186
@@ -3749,8 +3798,9 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:313
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1059
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1065
 msgid "Path"
 msgstr "Pfad"
 
@@ -3767,8 +3817,8 @@ msgid "Formats"
 msgstr "Formate"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:25
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:886
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1062
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:891
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1068
 msgid "Collections"
 msgstr "Sammlungen"
 
@@ -3781,12 +3831,12 @@ msgstr "Zum Öffnen klicken"
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:305
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:311
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:317
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1068
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1072
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1074
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:458
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:467
 msgid "None"
 msgstr "Keine"
 
@@ -4913,11 +4963,11 @@ msgstr ""
 "von XPath finden Sie im <a href=\"http://calibre-"
 "ebook.com/user_manual/xpath.html\">XPath Tutorial</a>."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:127
 msgid "Cover browser could not be loaded"
 msgstr "Cover-Browser konnte nicht geladen werden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:179
 msgid "Browse by covers"
 msgstr "Umschlagbilder durchsuchen"
 
@@ -5109,121 +5159,117 @@ msgstr "Gerät: "
 msgid " detected."
 msgstr " gefunden."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:778
-msgid "Connected "
-msgstr "Angeschlossen: "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:846
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "selected to send"
 msgstr "zum Übertragen ausgewählt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:851
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:846
 msgid "Choose format to send to device"
 msgstr "Format wählen, das ans Gerät geschickt wird"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:860
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:855
 msgid "No device"
 msgstr "Kein Gerät"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:856
 msgid "Cannot send: No device is connected"
 msgstr "Übertragung schlug fehl: Kein Gerät verbunden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:868
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:859
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:863
 msgid "No card"
 msgstr "Keine Speicherkarte"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:869
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:860
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "Cannot send: Device has no storage card"
 msgstr "Übertragung schlug fehl: Keine Speicherkarte im Gerät"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:910
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:905
 msgid "E-book:"
 msgstr "eBook:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:913
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:908
 msgid "Attached, you will find the e-book"
 msgstr "Im Anhang finden Sie das eBook"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:909
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:181
 msgid "by"
 msgstr "von"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:915
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:910
 msgid "in the %s format."
 msgstr "im %s Format."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:928
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:923
 msgid "Sending email to"
 msgstr "Sende eMail an"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:958
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:965
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1057
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1118
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1236
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:953
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:961
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1053
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1115
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1234
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1242
 msgid "No suitable formats"
 msgstr "Keine geeigneten Formate"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:959
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:954
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 "Die folgenden Bücher vor dem Versenden per eMail automatisch konvertieren?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:966
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:962
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 "Konnte die folgenden Bücher nicht versenden, da geeignete Formate fehlen:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:984
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:980
 msgid "Failed to email books"
 msgstr "Senden der Bücher schlug fehl"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:985
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:981
 msgid "Failed to email the following books:"
 msgstr "Senden der folgenden Bücher schlug fehl:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:989
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:985
 msgid "Sent by email:"
 msgstr "Per eMail versendet:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1016
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1012
 msgid "News:"
 msgstr "Nachrichten:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1017
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1013
 msgid "Attached is the"
 msgstr "Im Anhang ist"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1028
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1024
 msgid "Sent news to"
 msgstr "Nachrichten senden an"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1058
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1237
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1054
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1235
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 "Die folgenden Bücher vor dem Laden auf das Gerät automatisch konvertieren?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1087
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1084
 msgid "Sending catalogs to device."
 msgstr "Sende Kataloge ans Gerät."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1150
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1148
 msgid "Sending news to device."
 msgstr "Sende Nachrichten an das Gerät."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1201
 msgid "Sending books to device."
 msgstr "Sende Bücher an das Gerät."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1244
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1243
 msgid ""
 "Could not upload the following books to the device, as no suitable formats "
 "were found. Convert the book(s) to a format supported by your device first."
@@ -5232,11 +5278,11 @@ msgstr ""
 "fehlen. Konvertieren Sie die Bücher zuerst in ein von Ihrem Gerät "
 "unterstütztes Format."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1305
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1304
 msgid "No space on device"
 msgstr "Gerätespeicher voll"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1306
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1305
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -5276,7 +5322,7 @@ msgid "My Books"
 msgstr "Meine Bücher"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:69
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:289
 msgid "Generate catalog"
 msgstr "Erstelle Katalog"
 
@@ -5420,11 +5466,11 @@ msgstr "Breit"
 msgid "Narrow"
 msgstr "Schmal"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:503
 msgid "System port selected"
 msgstr "System-Port ausgewählt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:503
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:504
 msgid ""
 "The value <b>%d</b> you have chosen for the content server port is a system "
 "port. Your operating system <b>may</b> not allow the server to run on this "
@@ -5435,133 +5481,133 @@ msgstr ""
 "dass der Server auf diesem Port läuft. Sie sind auf der sicheren Seite, wenn "
 "Sie eine Port Zahl größer als 1024 wählen."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:524
 msgid "Failed to install command line tools."
 msgstr "Die Installation der Befehlszeilen-Tools schlug fehl."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:527
 msgid "Command line tools installed"
 msgstr "Kommandozeilen-Tools installiert"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:528
 msgid "Command line tools installed in"
 msgstr "Kommandozeilen-Tools installiert in"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:529
 msgid ""
 "If you move calibre.app, you have to re-install the command line tools."
 msgstr ""
 "Wenn Sie Calibre.app verschieben, müssen Sie die Befehlszeilen-Tools neu "
 "installieren."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:580
 msgid "No valid plugin path"
 msgstr "Kein gültiger Plugin-Pfad"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:581
 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/__init__.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:584
 msgid "Choose plugin"
 msgstr "Plugin wählen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:596
 msgid "Plugin cannot be disabled"
 msgstr "Plugin kann nicht ausgeschaltet werden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:597
 msgid "The plugin: %s cannot be disabled"
 msgstr "Das Plugin: %s kann nicht ausgeschaltet werden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:606
 msgid "Plugin not customizable"
 msgstr "Plugin nicht anpassbar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:607
 msgid "Plugin: %s does not need customization"
 msgstr "Plugin: %s bedarf keines Anpassens"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:615
 msgid "Customize"
 msgstr "Anpassen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:652
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:653
 msgid "Cannot remove builtin plugin"
 msgstr "Kann festinstalliertes Plugin nicht entfernen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:653
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:654
 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/__init__.py:684
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:685
 msgid "You must select a column to delete it"
 msgstr "Sie müssen eine Spalte auswählen, um sie zu löschen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:690
 msgid "The selected column is not a custom column"
 msgstr "Die gewählte Spalte ist keine benutzerdefinierte Spalte"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:690
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:691
 #: /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/config/__init__.py:691
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:692
 msgid "Do you really want to delete column %s and all its data?"
 msgstr "Wollen Sie wirklich die Spalte %s und ihre gesamten Daten löschen?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:758
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:759
 msgid "Error log:"
 msgstr "Fehler Log:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:765
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:766
 msgid "Access log:"
 msgstr "Zugriffs-Protokolldatei:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:793
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:794
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:332
 msgid "Failed to start content server"
 msgstr "Content Server konnte nicht gestartet werden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:817
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:818
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:587
 msgid "Select location for books"
 msgstr "Speicherort für Bücher wählen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:824
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:825
 msgid "Invalid size"
 msgstr "Ungültige Größe"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:825
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:826
 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/__init__.py:884
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:889
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:891
 msgid "Invalid database location"
 msgstr "Ortsangabe der Datenbank ungültig"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:885
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:887
 msgid "Invalid database location "
 msgstr "Ortsangabe der Datenbank ungültig "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:888
 msgid "<br>Must be a directory."
 msgstr "<br>Muss ein Verzeichnis sein."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:890
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:892
 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/__init__.py:895
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:897
 msgid "Must restart"
 msgstr "Neustart erforderlich"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:896
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:898
 msgid ""
 "The changes you made require that Calibre be restarted. Please restart as "
 "soon as practical."
@@ -5569,19 +5615,19 @@ msgstr ""
 "Die gewählten Änderungen erfordern einen Neustart von Calibre. Bitte starten "
 "Sie baldmöglichst neu."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:930
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:932
 msgid "Checking database integrity"
 msgstr "Überprüfe Vollständigkeit der Datenbank"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:950
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:952
 msgid "Failed to check database integrity"
 msgstr "Überprüfung der Vollständigkeit der Datenbank schlug fehl"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:957
 msgid "Some inconsistencies found"
 msgstr "Einige Inkonsistenzen gefunden."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:956
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:958
 msgid ""
 "The following books had formats listed in the database that are not actually "
 "available. The entries for the formats have been removed. You should check "
@@ -5726,14 +5772,14 @@ msgstr ""
 msgid "Sending to &device"
 msgstr "An das Gerät sen&den"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:167
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
@@ -5742,29 +5788,29 @@ msgstr ""
 "sortiert gespeichert und die Metadaten werden in der Datei metadata.db "
 "gespeichert)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
 msgid "Browse for the new database location"
 msgstr "Zu einem neuen Ort der Datenbank wechseln"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
 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/config_ui.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
 msgid "Download &social metadata (tags/ratings/etc.) by default"
 msgstr ""
 "&Soziale Metadaten (Etikettierung/Bewertung/etc.) laden als Voreinstellung"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
 msgid "&Overwrite author and title by default when fetching metadata"
 msgstr ""
 "Autor und Titel standardmäßig überschreiben, wenn Metadaten geholt werden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
 msgid "Default network &timeout:"
 msgstr "Voreinstellung für Zei&tüberschreitung bei Netzwerkverbindungen:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
@@ -5772,156 +5818,160 @@ 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/config_ui.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
 msgid " seconds"
 msgstr " Sekunden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
 msgid "Choose &language (requires restart):"
 msgstr "Sprache wäh&len (erfordert Neustart):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
 msgid "Normal"
 msgstr "Normal"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
 msgid "High"
 msgstr "Hoch"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
 msgid "Low"
 msgstr "Niedrig"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
 msgid "Job &priority:"
 msgstr "Auftrags&priorität:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
 msgid "Preferred &output format:"
 msgstr "Bev&orzugtes Ausgabe-Format:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
 msgid "Preferred &input format order:"
 msgstr "Bevorzugte Reihenfolge des E&ingabe-Formats:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
 msgid "Use &Roman numerals for series number"
 msgstr "&Römische Ziffern für Reihennummerierung verwenden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
 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/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
 msgid "Show &notifications in system tray"
 msgstr "Be&nachrichtigungen im Systembereich der Kontrollleiste anzeigen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
 msgid "Show &splash screen at startup"
 msgstr "Spla&sh-Screen beim Starten anzeigen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr "Zeige Cover-Ansicht in einem eigenen Fenster (erfordert Neustart)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
 msgid "Show &average ratings in the tags browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
 msgid "Search as you type"
 msgstr "Suchen während der Eingabe"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
 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/config_ui.py:578
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
 msgid "&Delete news from library when it is automatically sent to reader"
 msgstr ""
 "Nachrichten nach der automatischen Übertragung auf das Gerät aus der "
 "Bibliothek &löschen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 "A&nzahl der anzuzeigenden Umschlagbilder in der Cover-Ansicht (erfordert "
 "Neustart):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
 msgid "Toolbar"
 msgstr "Symbolleiste"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
 msgid "Large"
 msgstr "Groß"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
 msgid "Medium"
 msgstr "Mittel"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
 msgid "Small"
 msgstr "Klein"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
 msgid "&Button size in toolbar"
 msgstr "&Größe der Schaltflächen in der Symbolleiste"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
 msgid "Show &text in toolbar buttons"
 msgstr "Zeige &Text in Schaltflächen der Symbolleiste"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
 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/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
 msgid "Remove a user-defined column"
 msgstr "Benutzerdefinierte Spalte entfernen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
 msgid "Add a user-defined column"
 msgstr "Benutzerdefinierte Spalte hinzufügen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
 msgid "Edit settings of a user-defined column"
 msgstr "Einstellungen einer benutzerdefinierten Spalte ändern"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
 msgid "Use internal &viewer for:"
 msgstr "Internen &Viewer verwenden für:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
 msgid "User Interface &layout (needs restart):"
 msgstr "Aussehen der Benutzeroberf&läche (Neustart erforderlich):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
 msgid "Disable &animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
+msgid "Show &donate button (restart)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
 msgid "Add an email address to which to send books"
 msgstr "Eine eMail-Adresse hinzufügen, an die die Bücher gesendet werden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
 msgid "&Add email"
 msgstr "eM&ail hinzufügen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
 msgid "Make &default"
 msgstr "Als Voreinstellung verwenden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
 msgid "&Remove email"
 msgstr "eMail entfe&rnen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
 msgid ""
 "calibre can send your books to you (or your reader) by email. Emails will be "
 "automatically sent for downloaded news to all email addresses that have Auto-"
@@ -5931,35 +5981,35 @@ msgstr ""
 "eMails werden automatisch für geladene Nachrichten an alle eMail-Adressen "
 "mit aktiviertem Auto-Send verschickt."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
 msgid "&Maximum number of waiting worker processes (needs restart):"
 msgstr ""
 "&Maximale Anzahl der Arbeitsprozesse in der Warteschlange (erfordert "
 "Neustart):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
 msgid "&Check database integrity"
 msgstr "Vollständigkeit der &Datenbank überprüfen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
 msgid "&Install command line tools"
 msgstr "Kommandozeilen-Tools &installieren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
 msgid "Open calibre &configuration directory"
 msgstr "&Calibre Einstellungsverzeichnis öffnen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
 msgid "Limit the max. simultaneous jobs to the available CPU &cores"
 msgstr ""
 "Die maximale Anzahl gleichzeitiger Aufträge auf die Anzahl der &CPU-Kerne "
 "beschränken."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
 msgid "Debug &device detection"
 msgstr "Fehlersuche bei &der Geräteerkennung"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
 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 "
@@ -5969,25 +6019,25 @@ 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/config_ui.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
 msgid "Server &port:"
 msgstr "Server &Port:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:212
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:117
 msgid "&Username:"
 msgstr "Ben&utzername:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:213
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:119
 msgid "&Password:"
 msgstr "&Passwort:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
@@ -5995,7 +6045,7 @@ 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/config_ui.py:615
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
@@ -6003,45 +6053,45 @@ msgstr ""
 "Maximale Größe (BreitexHöhe) der angezeigten Umschlagbilder. Größere "
 "Umschlagbilder werden verkleinert. "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
 msgid "Max. &cover size:"
 msgstr "Maximale Ums&chlagbild-Größe:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:621
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:214
 msgid "&Show password"
 msgstr "Pa&sswort anzeigen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
 msgid "Max. &OPDS items per query:"
 msgstr "Maximale &ODPS Einträge pro Anfrage:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
 msgid "Max. OPDS &ungrouped items:"
 msgstr "Max. OPDS &ungeordnete Elemente:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
 msgid "&Start Server"
 msgstr "Server &starten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:621
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
 msgid "St&op Server"
 msgstr "Server st&oppen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:626
 msgid "&Test Server"
 msgstr "Server &testen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
 msgid "Run server &automatically on startup"
 msgstr "Server &automatisch beim Starten hochfahren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:628
 msgid "View &server logs"
 msgstr "Server Logs ansehen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:46
 msgid ""
 "<p>Remember to leave calibre running as the server only runs as long as "
@@ -6059,7 +6109,7 @@ msgstr ""
 "vollständige Servername oder die IP-Adresse des Rechners sein, auf dem "
 "Calibre läuft."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:631
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
@@ -6067,27 +6117,27 @@ 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/config_ui.py:628
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:632
 msgid "Enable/&Disable plugin"
 msgstr "Plugin &ein-/ausschalten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:633
 msgid "&Customize plugin"
 msgstr "Plugin &anpassen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:630
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:634
 msgid "&Remove plugin"
 msgstr "Plugin entfe&rnen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:635
 msgid "Add new plugin"
 msgstr "Neues Plugin hinzufügen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:632
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:636
 msgid "Plugin &file:"
 msgstr "&Plugin-Datei:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:634
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:638
 msgid "&Add"
 msgstr "&Hinzufügen"
 
@@ -6125,9 +6175,9 @@ msgstr "Nummer"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:31
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:884
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:889
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Date"
 msgstr "Datum"
@@ -6341,12 +6391,18 @@ msgstr "&Warnung erneut anzeigen"
 msgid "ERROR"
 msgstr "FEHLER"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:67
+msgid ""
+"All checked books will be <b>permanently deleted</b> from your device. "
+"Please verify the list."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 msgid "Location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1058
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1064
 msgid "Format"
 msgstr "Format"
 
@@ -7209,6 +7265,10 @@ msgstr ""
 "Etikett zu den verfügbaren Etiketten hinzufügen und dem aktuellen Buch "
 "zuweisen"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:20
+msgid "%s (was %s)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:501
 msgid "Item is blank"
@@ -7585,43 +7645,43 @@ msgstr "Regulärer Ausdruck (?P<isbn>)"
 msgid "Save single format to disk..."
 msgstr "Speichere einzelnes Format auf Festplatte..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:53
 msgid "Edit metadata individually"
 msgstr "Metadaten einzeln bearbeiten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:56
 msgid "Edit metadata in bulk"
 msgstr "Metadaten auf einmal bearbeiten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:59
 msgid "Download metadata and covers"
 msgstr "Metadaten und Umschlagbilder laden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:62
 msgid "Download only metadata"
 msgstr "Nur Metadaten laden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:64
 msgid "Download only covers"
 msgstr "Nur Umschlagbilder laden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:67
 msgid "Download only social metadata"
 msgstr "Nur soziale Metadaten laden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:73
 msgid "Merge into first selected book - delete others"
 msgstr "In das zuerst gewählte Buch zusammenführen - andere löschen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:76
 msgid "Merge into first selected book - keep others"
 msgstr "In das zuerst gewählte Buch zusammenführen - andere behalten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:84
 msgid "Add books from a single directory"
 msgstr "Bücher aus einem einzelnen Verzeichnis hinzufügen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:86
 msgid ""
 "Add books from directories, including sub-directories (One book per "
 "directory, assumes every ebook file is the same book in a different format)"
@@ -7630,7 +7690,7 @@ msgstr ""
 "Buch pro Verzeichnis, jede eBook Datei im Verzeichnis ist dasselbe Buch in "
 "verschiedenen Formaten)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:90
 msgid ""
 "Add books from directories, including sub directories (Multiple books per "
 "directory, assumes every ebook file is a different book)"
@@ -7638,99 +7698,115 @@ msgstr ""
 "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/init.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:93
 msgid "Add Empty book. (Book entry with no formats)"
 msgstr "Leeres Buch hinzufügen. (Bucheintrag ohne Formate)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:102
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
 msgid "Save to disk"
 msgstr "Auf Festplatte speichern"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Save to disk in a single directory"
 msgstr "Auf Festplatte in ein einziges Verzeichnis speichern"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:106
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:402
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:394
 msgid "Save only %s format to disk"
 msgstr "Nur das %s Format auf Festplatte speichern"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:110
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:397
 msgid "Save only %s format to disk in a single directory"
 msgstr ""
 "Dur das %s Format in ein einzelnes Verzeichnis auf der Festplatte speichern"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:119
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
 msgid "View"
 msgstr "Vorschau"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:121
 msgid "View specific format"
 msgstr "Spezielles Format ansehen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:127
 msgid "Remove selected books"
 msgstr "Gewählte Bücher entfernen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:129
 msgid "Remove files of a specific format from selected books.."
 msgstr "Dateien des angegebenen Formates der gewählten Bücher entfernen..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:132
 msgid "Remove all formats from selected books, except..."
 msgstr "Alle Formate der gewählten Bücher entfernen, außer..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:135
 msgid "Remove covers from selected books"
 msgstr "Umschlagbilder der gewählten Bücher entfernen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:138
 msgid "Remove matching books from device"
 msgstr "Passende Bücher vom Gerät löschen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:155
 msgid "Convert individually"
 msgstr "Einzeln konvertieren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:157
 msgid "Bulk convert"
 msgstr "Auf einmal konvertieren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:161
 msgid "Create catalog of books in your calibre library"
 msgstr "Erstelle Katalog der Bücher in der Calibre Bibliothek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:169
 msgid "Run welcome wizard"
 msgstr "Willkommens-Assistenten ausführen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:205
 msgid "Similar books..."
 msgstr "Ähnliche Bücher..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:237
 msgid "Add books to library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:234
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:241
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:253
 msgid "Manage collections"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:328
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:333
 msgid "Cover Browser"
 msgstr "Cover-Browser"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:351
 msgid "Tag Browser"
 msgstr "Etiketten-Browser"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:372
+msgid "version"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:373
+msgid "created by Kovid Goyal"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:391
+msgid "Connected "
+msgstr "Angeschlossen: "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:400
+msgid "Update found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:454
 msgid "Book Details"
 msgstr "Buchdetails"
 
@@ -7814,29 +7890,29 @@ msgid "Rating"
 msgstr "Bewertung"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:324
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1084
 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/models.py:674
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1176
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1182
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
 msgid "The lookup/search name is \"{0}\""
 msgstr "Der Such-Name ist \"{0}\""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:886
 msgid "In Library"
 msgstr "In der Bibliothek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:885
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:890
 msgid "Size"
 msgstr "Größe"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1156
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1162
 msgid "Marked for deletion"
 msgstr "Zum Löschen ausgewählt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1165
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr "Doppelklick ermöglicht <b>Bearbeitung</b><br><br>"
 
@@ -7880,11 +7956,11 @@ msgstr "Spalte anzeigen"
 msgid "Restore default layout"
 msgstr "Voreingestelltes Layout wiederherstellen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:524
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:525
 msgid "Not allowed"
 msgstr "Das ist nicht gestattet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:526
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
@@ -8092,39 +8168,39 @@ msgstr "Versuchen Sie Ihren Rechner neu zu starten."
 msgid "try deleting the file"
 msgstr "Versuche Sie die Datei zu löschen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:247
 msgid "calibre"
 msgstr "Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:249
 msgid "&Restrict to:"
 msgstr "Besch&ränken auf:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:250
 msgid ""
 "Books display will be restricted to those matching the selected saved search"
 msgstr ""
 "Es werden nur die Bücher angezeigt, die auf die gewählte gespeicherte Suche "
 "zutreffen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:251
 msgid "set in ui.py"
 msgstr "Einstellen in ui.py"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:252
 msgid "Advanced search"
 msgstr "Erweiterte Suche"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
 msgid "Alt+S"
 msgstr "Alt+S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
 msgid "&Search:"
 msgstr "&Suche:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
 msgid ""
 "<p>Search the list of books by title, author, publisher, tags, comments, "
 "etc.<br><br>Words separated by spaces are ANDed"
@@ -8133,120 +8209,127 @@ msgstr ""
 "Kommentaren, etc.<br><br>Durch Leerzeichen getrennte Worte werden mit UND "
 "verknüpft"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
 msgid "Reset Quick Search"
 msgstr "Quick Search löschen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
-msgid "Choose saved search or enter name for new saved search"
-msgstr ""
-"Gespeicherte Suche wählen oder Namen für neue gespeicherte Suche eingeben"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
 msgid "Copy current search text (instead of search name)"
 msgstr "Aktuellen Suchtext kopieren (anstelle des Namens der Suche)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
 msgid "Save current search under the name shown in the box"
 msgstr "Aktuelle Suche unter dem in der Box angezeigten Namen speichern"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
 msgid "Delete current saved search"
 msgstr "Aktuell gespeicherte Suche löschen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
 msgid "Add books"
 msgstr "Bücher hinzufügen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
 msgid "A"
 msgstr "A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
 msgid "Remove books"
 msgstr "Bücher entfernen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
 msgid "Del"
 msgstr "Löschen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
 msgid "Edit meta information"
 msgstr "Meta-Informationen editieren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
 msgid "E"
 msgstr "E"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
 msgid "Merge book records"
 msgstr "Bucheinträge zusammenfügen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
 msgid "M"
 msgstr "M"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
 msgid "Send to device"
 msgstr "An Reader übertragen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
 msgid "S"
 msgstr "S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
 msgid "Fetch news"
 msgstr "Nachrichten abrufen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
 msgid "Convert E-books"
 msgstr "In eBooks umwandeln"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
 msgid "C"
 msgstr "C"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
 msgid "V"
 msgstr "V"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
 msgid "Open containing folder"
 msgstr "Öffne Speicherort"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
 msgid "Show book details"
 msgstr "Zeige Buchdetails"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
 msgid "Books by same author"
 msgstr "Bücher desselben Autors"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
 msgid "Books in this series"
 msgstr "Bücher dieser Reihe"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
 msgid "Books by this publisher"
 msgstr "Bücher dieses Herausgebers"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
 msgid "Books with the same tags"
 msgstr "Bücher mit denselben Etiketten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
 msgid "Configure calibre"
 msgstr "Calibre konfigurieren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
 msgid "Ctrl+P"
 msgstr "Ctrl+P"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
+msgid "Help"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
+msgid "Browse the calibre User Manual"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
+msgid "F1"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:20
 msgid ""
 "Redirect console output to a dialog window (both stdout and stderr). Useful "
@@ -8276,32 +8359,37 @@ msgstr "Buch hat weder Titel noch ISBN"
 msgid "No matches found for this book"
 msgstr "Keine Treffer für dieses Buch"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:91
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:262
 msgid "Search"
 msgstr "Suche"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:313
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:315
 msgid "The selected search will be <b>permanently deleted</b>. Are you sure?"
 msgstr "Die gewählte Suche wird <b>dauerhaft gelöscht</b>. Sind Sie sicher?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:357
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr "Suche (Zur erweiterten Suche die Schaltfläche links klicken)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:392
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:398
 msgid "Saved Searches"
 msgstr "Gespeicherte Suchergebnisse"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:406
+msgid "Choose saved search or enter name for new saved search"
+msgstr ""
+"Gespeicherte Suche wählen oder Namen für neue gespeicherte Suche eingeben"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:47
 msgid "({0} of {1})"
 msgstr "({0} von {1})"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:53
 msgid "(all books)"
 msgstr "(Alle Bücher)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:55
 msgid "({0} of all)"
 msgstr "({0} von allen)"
 
@@ -8424,18 +8512,31 @@ msgstr ""
 msgid "Sort by average rating"
 msgstr "Nach Bewertungsdurchschnitt sortieren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:775
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:772
+msgid "Set the sort order for entries in the Tag Browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:778
 msgid "Match all"
 msgstr "Übereinstimmung mit allen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:775
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:778
 msgid "Match any"
 msgstr "Übereinstimmung mit irgendeinem"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:783
+msgid ""
+"When selecting multiple entries in the Tag Browser match any or all of them"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:787
 msgid "Manage &user categories"
 msgstr "Ben&utzer-Kategorien verwalten"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:790
+msgid "Add your own categories to the Tag Browser"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182
 msgid "Convert book %d of %d (%s)"
@@ -8463,15 +8564,15 @@ msgstr "Bücher sammeln und zusammen konvertieren"
 msgid "Queueing "
 msgstr "Sammle "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:239
 msgid "Fetch news from "
 msgstr "Nachrichten abrufen von "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:301
 msgid "Convert existing"
 msgstr "Konvertiere bestehende"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:302
 msgid ""
 "The following books have already been converted to %s format. Do you wish to "
 "reconvert them?"
@@ -8487,55 +8588,46 @@ msgstr "&Wiederherstellen"
 msgid "&Donate to support calibre"
 msgstr "Spen&den Sie, um Calibre zu unterstützen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:168
 msgid "&Eject connected device"
 msgstr "Verbundenes Gerät ausw&erfen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:173
 msgid "&Restart"
 msgstr "&Neustart"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:206
-msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
-msgstr ""
-"<p>Hilfe finden Sie in der <a href=\"%s\">Bedienungsanleitung</a><br>"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:212
-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/ui.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:227
 msgid "Calibre Quick Start Guide"
 msgstr "Calibre Quick-Start-Guide"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:389
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:381
 msgid "Cannot configure"
 msgstr "Konfiguration nicht möglich"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:377
 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/ui.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:382
 msgid "Cannot configure before calibre is restarted."
 msgstr "Konfiguration erst nach einem Neustart von Calibre möglich."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:425
 msgid "No detailed info available"
 msgstr "Es sind keine genaueren Informationen verfügbar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:426
 msgid "No detailed information is available for books on the device."
 msgstr ""
 "Es sind keine weitere Informationen über Bücher auf dem Gerät verfügbar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:486
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:478
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:506
 msgid "Conversion Error"
 msgstr "Konvertierungsfehler"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:487
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:479
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using third party tools."
@@ -8544,29 +8636,27 @@ msgstr ""
 "href=\"%s\">DRM</a> geschütztes Buch. Sie müssen zuerst das DRM mit Hilfe "
 "anderer Programme entfernen."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:492
 msgid "Recipe Disabled"
 msgstr "Downloadschema ausgeschalten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:507
 msgid "<b>Failed</b>"
 msgstr "<b>Misslungen</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:547
 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."
+"you find it useful, please consider donating to support its development. "
+"Your donation helps keep calibre development going."
 msgstr ""
-"beruht auf den Anstrengungen von vielen Freiwilligen aus der ganzen Welt. "
-"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/ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:573
 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/ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:576
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
@@ -8577,11 +8667,11 @@ msgstr ""
 "verursachen.<br>\n"
 "                      Sind Sie sicher, dass sie beenden möchten?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 msgid "WARNING: Active jobs"
 msgstr "WARNUNG: Aktive Aufträge"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:640
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:633
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -8589,19 +8679,11 @@ 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/update.py:52
-msgid ""
-"<span style=\"color:red; font-weight:bold\">Latest version: <a "
-"href=\"%s\">%s</a></span>"
-msgstr ""
-"<span style=\"color:red; font-weight:bold\">Letzte Version: <a "
-"href=\"%s\">%s</a></span>"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/update.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:56
 msgid "Update available"
 msgstr "Neue Version verfügbar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/update.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:57
 msgid ""
 "%s has been updated to version %s. See the <a href=\"http://calibre-"
 "ebook.com/whats-new\">new features</a>. Visit the download page?"
@@ -9095,42 +9177,26 @@ msgstr "Bild einfügen"
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:270
 msgid ""
 "Library\n"
-"%d\n"
-"books"
+"%d books"
 msgstr ""
-"Bibliothek\n"
-"%d\n"
-"Bücher"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:271
 msgid ""
 "Reader\n"
-"%s\n"
-"available"
+"%s"
 msgstr ""
-"Reader\n"
-"%s\n"
-"verfügbar"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:272
 msgid ""
 "Card A\n"
-"%s\n"
-"available"
+"%s"
 msgstr ""
-"Karte A\n"
-"%s\n"
-"verfügbar"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:273
 msgid ""
 "Card B\n"
-"%s\n"
-"available"
+"%s"
 msgstr ""
-"Karte B\n"
-"%s\n"
-"verfügbar"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:277
 msgid "Click to see the books available on your computer"
@@ -9155,35 +9221,39 @@ msgstr ""
 msgid "Books located at"
 msgstr "Bücher finden sich in"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:306
+msgid "free"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:557
 msgid "Change Case"
 msgstr "Groß-/Kleinschreibung ändern"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:558
 msgid "Upper Case"
 msgstr "Großschreibung"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:559
 msgid "Lower Case"
 msgstr "Kleinschreibung"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:560
 msgid "Swap Case"
 msgstr "Groß-/Kleinschreibung vertauschen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:561
 msgid "Title Case"
 msgstr "Wortanfänge groß schreiben"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:974
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:983
 msgid "Drag to resize"
 msgstr "Zur Größenänderung ziehen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1015
 msgid "Show"
 msgstr "Anzeigen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1012
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1022
 msgid "Hide"
 msgstr "Ausblenden"
 
@@ -10742,84 +10812,84 @@ msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 "Das \"%s\" Downloadschema benötigt einen Benutzernamen und ein Passwort."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:706
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:708
 msgid "Download finished"
 msgstr "Download beendet"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:708
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:710
 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:714
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:716
 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:716
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:718
 msgid " from "
 msgstr " von "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:718
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:720
 msgid "\tFailed links:"
 msgstr "\tFehlgeschlagene Verknüpfungen:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:807
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:809
 msgid "Could not fetch article. Run with -vv to see the reason"
 msgstr ""
 "Konnte Artikel nicht abrufen. Mit -vv starten, um den Grund dafür zu sehen"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:828
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:830
 msgid "Fetching feeds..."
 msgstr "Rufe Feeds ab..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:833
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:835
 msgid "Got feeds from index page"
 msgstr "Feeds der Index-Seite erhalten"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:839
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:841
 msgid "Trying to download cover..."
 msgstr "Umschlagbild versuchen heruterzuladen ..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:841
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Generating masthead..."
 msgstr "Erstelle Impressum..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:922
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:924
 msgid "Starting download [%d thread(s)]..."
 msgstr "Download von [%d Thread(s)] starten ..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:938
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:940
 msgid "Feeds downloaded to %s"
 msgstr "Feeds wurden nach %s heruntergeladen"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:948
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:950
 msgid "Could not download cover: %s"
 msgstr "Umschlagbild konnte nicht heruntergeladen werden: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:960
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
 msgid "Downloading cover from %s"
 msgstr "Umschlagbild von %s herunterladen"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1002
 msgid "Masthead image downloaded"
 msgstr "Impressumskopie geladen"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1190
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1192
 msgid "Untitled Article"
 msgstr "Artikel ohne Titel"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1261
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1263
 msgid "Article downloaded: %s"
 msgstr "Artikel heruntergeladen: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1272
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1274
 msgid "Article download failed: %s"
 msgstr "Herunterladen der Artikel schlug fehl: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1289
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1291
 msgid "Fetching feed"
 msgstr "Feed abrufen"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1436
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1438
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
@@ -10827,7 +10897,7 @@ msgstr ""
 "Login fehlgeschlagen, überprüfen Sie ihren Benutzername und Passwort für den "
 "calibre Magazin Service."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1452
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1454
 msgid ""
 "You do not have permission to download this issue. Either your subscription "
 "has expired or you have exceeded the maximum allowed downloads for today."
@@ -11491,6 +11561,13 @@ msgstr "CSS-Stylesheets nicht herunterladen."
 #~ msgid "Could not move database"
 #~ msgstr "Konnte Datenbank nicht verschieben"
 
+#~ msgid ""
+#~ "<span style=\"color:red; font-weight:bold\">Latest version: <a "
+#~ "href=\"%s\">%s</a></span>"
+#~ msgstr ""
+#~ "<span style=\"color:red; font-weight:bold\">Letzte Version: <a "
+#~ "href=\"%s\">%s</a></span>"
+
 #~ msgid ""
 #~ "Options to control web2disk (used to fetch websites linked from feeds)"
 #~ msgstr ""
@@ -11537,6 +11614,9 @@ msgstr "CSS-Stylesheets nicht herunterladen."
 #~ "<p>Hilfe gibt es online bei <a "
 #~ "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
 
+#~ 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>"
+
 #~ msgid "Starting Bulk conversion of %d books"
 #~ msgstr "Starte Massenkonvertierung von %d Büchern"
 
@@ -12230,6 +12310,14 @@ msgstr "CSS-Stylesheets nicht herunterladen."
 #~ msgid "You must set a username and password for %s"
 #~ msgstr "Sie müssen einen Benutzernamen und ein Kennwort angeben für %s"
 
+#~ 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 ""
+#~ "beruht auf den Anstrengungen von vielen Freiwilligen aus der ganzen Welt. "
+#~ "Falls Sie es nützlich finden, sollten Sie eine Spende zur Unterstützung "
+#~ "seiner Entwicklung in Betracht ziehen."
+
 #~ msgid "author"
 #~ msgstr "Autor"
 
@@ -12265,6 +12353,24 @@ msgstr "CSS-Stylesheets nicht herunterladen."
 #~ "%s\n"
 #~ "verfügbar"
 
+#~ msgid ""
+#~ "Reader\n"
+#~ "%s\n"
+#~ "available"
+#~ msgstr ""
+#~ "Reader\n"
+#~ "%s\n"
+#~ "verfügbar"
+
+#~ msgid ""
+#~ "Library\n"
+#~ "%d\n"
+#~ "books"
+#~ msgstr ""
+#~ "Bibliothek\n"
+#~ "%d\n"
+#~ "Bücher"
+
 #~ msgid ""
 #~ "%%prog [options] filename\n"
 #~ "\n"
@@ -13063,6 +13169,24 @@ msgstr "CSS-Stylesheets nicht herunterladen."
 #~ msgid "Starting conversion of %d books"
 #~ msgstr "Starte Konvertierung von %d Büchern"
 
+#~ msgid ""
+#~ "Card A\n"
+#~ "%s\n"
+#~ "available"
+#~ msgstr ""
+#~ "Karte A\n"
+#~ "%s\n"
+#~ "verfügbar"
+
+#~ msgid ""
+#~ "Card B\n"
+#~ "%s\n"
+#~ "available"
+#~ msgstr ""
+#~ "Karte B\n"
+#~ "%s\n"
+#~ "verfügbar"
+
 #~ msgid "Catalan"
 #~ msgstr "Katalanisch"
 
@@ -13237,6 +13361,10 @@ msgstr "CSS-Stylesheets nicht herunterladen."
 #~ msgstr ""
 #~ "Dieses Profil ist geeignet für die SONY PRS-Reihe. PRS 500/505/700 etc."
 
+#~ msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
+#~ msgstr ""
+#~ "<p>Hilfe finden Sie in der <a href=\"%s\">Bedienungsanleitung</a><br>"
+
 #~ msgid "Output file. Default is derived from input filename."
 #~ msgstr ""
 #~ "Ausgabe-Datei. Die Voreinstellung stammt aus dem Namen der Eingabe-Datei."
diff --git a/src/calibre/translations/es.po b/src/calibre/translations/es.po
index bf0431e899..846ad367f2 100644
--- a/src/calibre/translations/es.po
+++ b/src/calibre/translations/es.po
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-03 01:21+0000\n"
-"PO-Revision-Date: 2010-07-06 14:21+0000\n"
-"Last-Translator: Jellby <Unknown>\n"
+"POT-Creation-Date: 2010-07-10 16:12+0000\n"
+"PO-Revision-Date: 2010-07-11 21:55+0000\n"
+"Last-Translator: DiegoJ <diegojromerolopez@gmail.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: 2010-07-07 03:38+0000\n"
+"X-Launchpad-Export-Date: 2010-07-13 03:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:465
@@ -32,7 +32,7 @@ msgstr ""
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr "Este perfil está pensado para el Kindle DX de Amazon."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:31
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
 msgid "Installed plugins"
 msgstr "Complementos instalados"
 
@@ -46,10 +46,10 @@ msgstr "No hace absolutamente nada"
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:71
 #: /home/kovid/work/calibre/src/calibre/devices/prs500/books.py:267
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:466
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:396
-#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:98
-#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:101
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:492
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:398
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:97
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:100
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/metadata.py:56
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:428
 #: /home/kovid/work/calibre/src/calibre/ebooks/fb2/input.py:67
@@ -91,9 +91,9 @@ msgstr "No hace absolutamente nada"
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:818
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:49
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:51
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:910
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:915
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:981
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:911
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:916
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:982
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:137
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:139
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:108
@@ -121,20 +121,20 @@ msgstr "No hace absolutamente nada"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:233
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:290
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:815
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:818
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:814
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:817
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:172
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:179
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:22
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:135
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:903
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:912
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1192
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1195
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:899
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:908
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1191
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1194
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:120
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:155
@@ -142,8 +142,8 @@ msgstr "No hace absolutamente nada"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:172
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:362
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:877
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1054
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:882
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1060
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:87
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:92
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:185
@@ -189,7 +189,7 @@ msgstr "Escritor de metadatos"
 msgid "Catalog generator"
 msgstr "Generador de catálogo"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:15
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:16
 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 "
@@ -199,7 +199,7 @@ msgstr ""
 "con los archivos enlazados. Este complemento se ejecuta cada vez que se "
 "añade un archivo HTML a la biblioteca."
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:51
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:52
 msgid ""
 "Character encoding for the input HTML files. Common choices include: cp1252, "
 "latin1, iso-8859-1 and utf-8."
@@ -207,7 +207,7 @@ msgstr ""
 "Codificación de los archivos HTML de entrada. Las opciones comunes incluyen: "
 "cp1252, latin1, iso-8859-1 and utf-8."
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:58
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:59
 msgid ""
 "Create a PMLZ archive containing the PML file and all images in the "
 "directory pmlname_img or images. This plugin is run every time you add a PML "
@@ -217,49 +217,49 @@ msgstr ""
 "los directorios pmlname_img o images. Este complemento se ejecutará cada vez "
 "que añada un archivo PML a la biblioteca"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:90
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:93
 msgid "Extract cover from comic files"
 msgstr "Extraer la portada de los archivos de cómic"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:117
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:128
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:140
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:150
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:160
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:171
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:181
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:191
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:201
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:211
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:221
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:232
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:243
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:255
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:276
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:287
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:297
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:307
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:120
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:131
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:153
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:163
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:174
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:184
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:194
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:204
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:214
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:224
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:235
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:246
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:258
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:279
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:290
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:300
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:310
 msgid "Read metadata from %s files"
 msgstr "Leer metadatos desde ficheros %s"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:266
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:269
 msgid "Read metadata from ebooks in RAR archives"
 msgstr "Leer metadatos de libros electrónicos en archivos RAR"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:318
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:321
 msgid "Read metadata from ebooks in ZIP archives"
 msgstr "Leer metadatos de libros electrónicos en archivos ZIP"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:331
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:341
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:351
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:373
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:384
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:394
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:334
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:344
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:354
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:376
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:387
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:397
 msgid "Set metadata in %s files"
 msgstr "Asignar metadatos a los archivos %s"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:362
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:365
 msgid "Set metadata from %s files"
 msgstr "Establecer metadatos desde archivos %s"
 
@@ -408,32 +408,32 @@ msgstr "Este perfil está pensado para el SONY PRS-300."
 msgid "This profile is intended for the 5-inch JetBook."
 msgstr "Este perfil está pensado para el JetBook de 5 pulgadas."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:33
 msgid "Mapping for filetype plugins"
 msgstr "Asociaciones para complementos por tipos de archivo"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:33
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:34
 msgid "Local plugin customization"
 msgstr "Personalización del complemento local"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:34
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
 msgid "Disabled plugins"
 msgstr "Complementos desactivados"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
 msgid "Enabled plugins"
 msgstr "Complementos habilitados"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:83
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:84
 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:460
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:468
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr ""
 "La inicialización del complemento %s falló y generó la siguiente traza:"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:493
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
 msgid ""
 "    %prog options\n"
 "\n"
@@ -445,18 +445,18 @@ msgstr ""
 "    Personalizar calibre cargando complementos externos.\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:499
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr ""
 "Añadir un complemento especificando la ruta al archivo ZIP que lo contiene."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 "Eliminar un complemento personalizado por nombre. No tiene efecto en los "
 "complementos incorporados."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:503
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:511
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
@@ -464,15 +464,15 @@ msgstr ""
 "Personalizar complemento. Especifica el nombre del complemento y el texto de "
 "personalización separados por una coma."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:505
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:513
 msgid "List all installed plugins"
 msgstr "Lista de todos los complementos instalados"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Enable the named plugin"
 msgstr "Activar el complemento nombrado"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Disable the named plugin"
 msgstr "Desactivar el complemento nombrado"
 
@@ -631,7 +631,7 @@ msgstr "Comunicar con los lectores Hanlin V5."
 msgid "Communicate with the BOOX eBook reader."
 msgstr "Comunicar con el lector BOOX."
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:121
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:123
 msgid ""
 "Comma separated list of directories to send e-books to on the device. The "
 "first one that exists will be used."
@@ -704,34 +704,34 @@ msgstr "Comunicarse con el Kobo Reader"
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:51
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:54
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:57
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:157
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:159
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:64
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:67
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:70
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:130
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:137
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:160
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:139
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:162
 msgid "Getting list of books on device..."
 msgstr "Obteniendo la lista de libros en el dispositivo ..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:218
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:258
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:244
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:262
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:219
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:263
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:246
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:264
 msgid "Removing books from device..."
 msgstr "Eliminando libros del dispositivo..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:262
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:269
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:269
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:274
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:267
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:274
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:271
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:276
 msgid "Removing books from device metadata listing..."
 msgstr "Eliminando libros del listado de metatados del dispositivo..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:274
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:308
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:208
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:238
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:313
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:210
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:240
 msgid "Adding books to device metadata listing..."
 msgstr "Añadiendo libros al listado de metatados del dispositivo..."
 
@@ -747,6 +747,10 @@ msgstr "Comunicarse con el Booq Avant"
 msgid "Communicate with the Sweex MM300"
 msgstr "Comunicarse con el Sweex MM300"
 
+#: /home/kovid/work/calibre/src/calibre/devices/misc.py:75
+msgid "Communicate with the Pandigital Novel"
+msgstr "Comunicarse con el Pandigital Novel"
+
 #: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:17
 msgid "Communicate with the Nokia 770 internet tablet."
 msgstr "Comunicarse son la tableta de internet Nokia 770."
@@ -898,12 +902,12 @@ msgstr "Comunicar con un lector de libros electrónicos."
 msgid "Get device information..."
 msgstr "Obtener información del dispositivo..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:188
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:192
 msgid "Transferring books to device..."
 msgstr "Transfiriendo libros al dispositivo..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:305
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:307
 msgid "Sending metadata to device..."
 msgstr "Enviando metadatos al dispositivo..."
 
@@ -1675,6 +1679,64 @@ msgstr "Aplicando transformaciones al libro electrónico..."
 msgid "Creating"
 msgstr "Creando"
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/__init__.py:18
+msgid "ePub Fixer"
+msgstr "Corrector de ePub"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/epubcheck.py:18
+msgid "Workaround epubcheck bugs"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/epubcheck.py:22
+msgid ""
+"Workarounds for bugs in the latest release of epubcheck. epubcheck reports "
+"many things as errors that are not actually errors. epub-fix will try to "
+"detect these and replace them with constructs that epubcheck likes. This may "
+"cause significant changes to your epub, complain to the epubcheck project."
+msgstr ""
+"Solución temporal para los errores de la última versión de epubcheck. "
+"epubcheck informa de muchas errores que realmente no lo son. epub-fix "
+"intentará detectar éstos, y los sustituirá por construcciones que acepted "
+"epubcheck. Esto puede causar cambios significativos a su epub. Dirija sus "
+"quejas al proyecto epubcheck."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:19
+msgid ""
+"%prog [options] file.epub\n"
+"\n"
+"Fix common problems in EPUB files that can cause them to be rejected by "
+"poorly designed publishing services.\n"
+"\n"
+"By default, no fixing is done and messages are printed out for each error "
+"detected. Use the options to control which errors are automatically fixed."
+msgstr ""
+"%prog [options] file.epub\n"
+"\n"
+"Corrige problemas comunes en archivos EPUB que puedan hacer que se rechacen "
+"por servicios de publicación mal diseñados.\n"
+"\n"
+"Por defecto, no se realiza ninguna corrección y se imprimen mensajes para "
+"cada error detectado. Use las opciones para controlar qué errores se han de "
+"corregir automáticamente."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:50
+msgid "You must specify an epub file"
+msgstr "Ha de especificar un archivo epub"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:17
+msgid "Fix unmanifested files"
+msgstr "Corregir archivos sin manifiesto"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:21
+msgid ""
+"Fix unmanifested files. epub-fix can either add them to the manifest or "
+"delete them as specified by the delete unmanifested option."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:32
+msgid "Delete unmanifested files instead of adding them to the manifest"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:56
 msgid ""
 "Extract the contents of the generated EPUB file to the specified directory. "
@@ -2044,11 +2106,11 @@ msgstr "Cómic"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:98
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:882
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:887
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:543
 msgid "Title"
 msgstr "Título"
@@ -2057,7 +2119,7 @@ msgstr "Título"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:364
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:883
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:888
 msgid "Author(s)"
 msgstr "Autor(es)"
 
@@ -2080,7 +2142,7 @@ msgstr "Productor"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:67
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:318
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1073
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1079
 msgid "Comments"
 msgstr "Comentarios"
 
@@ -2089,7 +2151,7 @@ msgstr "Comentarios"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:306
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1069
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1075
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:139
 msgid "Tags"
 msgstr "Etiquetas"
@@ -2099,7 +2161,7 @@ msgstr "Etiquetas"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:323
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1084
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:87
 msgid "Series"
 msgstr "Serie"
@@ -2109,7 +2171,7 @@ msgid "Language"
 msgstr "Idioma"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:406
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1067
 msgid "Timestamp"
 msgstr "Marca de tiempo"
 
@@ -2381,7 +2443,7 @@ msgstr ""
 "libro identificado por el ISBN.\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1226
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1398
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1399
 msgid "Cover"
 msgstr "Portada"
 
@@ -2425,70 +2487,70 @@ msgstr "Todos los artículos"
 msgid "This is an Amazon Topaz book. It cannot be processed."
 msgstr "Este es un libro Topaz de Amazon. No se puede procesar."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1399
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1400
 msgid "Title Page"
 msgstr "Página de título"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1400
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1401
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:15
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:53
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:194
 msgid "Table of Contents"
 msgstr "Índice"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1401
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1402
 msgid "Index"
 msgstr "Índice analítico"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1402
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1403
 msgid "Glossary"
 msgstr "Glosario"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1403
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1404
 msgid "Acknowledgements"
 msgstr "Agradecimientos"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1404
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1405
 msgid "Bibliography"
 msgstr "Bibliografía"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1405
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1406
 msgid "Colophon"
 msgstr "Colofón"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1406
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1407
 msgid "Copyright"
 msgstr "Copyright"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1407
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1408
 msgid "Dedication"
 msgstr "Dedicatoria"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1408
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1409
 msgid "Epigraph"
 msgstr "Epígrafe"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1409
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1410
 msgid "Foreword"
 msgstr "Prólogo"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1410
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1411
 msgid "List of Illustrations"
 msgstr "Lista de ilustraciones"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1411
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1412
 msgid "List of Tables"
 msgstr "Lista de tablas"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1412
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1413
 msgid "Notes"
 msgstr "Notas"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1413
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1414
 msgid "Preface"
 msgstr "Prefacio"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1414
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1415
 msgid "Main Text"
 msgstr "Texto principal"
 
@@ -2536,7 +2598,7 @@ msgstr "Recuadro"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:22
 #: /home/kovid/work/calibre/src/calibre/ebooks/tcr/input.py:23
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:23
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:24
 msgid ""
 "Normally calibre treats blank lines as paragraph markers. With this option "
 "it will assume that every line represents a paragraph instead."
@@ -2546,7 +2608,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:26
 #: /home/kovid/work/calibre/src/calibre/ebooks/tcr/input.py:27
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:27
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:28
 msgid ""
 "Normally calibre treats blank lines as paragraph markers. With this option "
 "it will assume that every line starting with an indent (either a tab or 2+ "
@@ -2709,7 +2771,7 @@ msgstr ""
 "Obtener información sobre un PDF.\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
 msgid "Author"
 msgstr "Autor"
@@ -2887,7 +2949,7 @@ msgstr ""
 "es la menor compresión, pero la más rápida, y 10 es la mayor compresión, "
 "pero la más lenta."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:33
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:34
 msgid ""
 "Normally extra spaces are condensed into a single space. With this option "
 "all spaces will be displayed."
@@ -2895,7 +2957,7 @@ msgstr ""
 "Normalmente los espacios adicionales se condensan en uno solo. Con esta "
 "opción se muestran todos los espacios."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:36
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:37
 msgid ""
 "Run the text input through the markdown pre-processor. To learn more about "
 "markdown see"
@@ -2903,7 +2965,7 @@ msgstr ""
 "Preprocesar la entrada de texto como markdown. Para más información sobre "
 "markdown ver"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:39
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:40
 msgid "Do not insert a Table of Contents into the output text."
 msgstr "No inserte una tabla de contenido en el texto de salida."
 
@@ -3089,7 +3151,7 @@ msgstr "Copiar"
 msgid "Copy to Clipboard"
 msgstr "Copiar al portapapeles"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:400
 msgid "Choose Files"
 msgstr "Escoger ficheros"
 
@@ -3104,13 +3166,13 @@ msgid "User annotations generated from main library only"
 msgstr "Usar anotaciones generadas sólo desde la biblioteca principal"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:75
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:612
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:671
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:708
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:729
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:877
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1060
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:670
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:707
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:728
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:876
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:941
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1059
 msgid "No books selected"
 msgstr "No hay libros seleccionados"
 
@@ -3150,145 +3212,145 @@ msgstr "¿Cuantos libros vacios?"
 msgid "How many empty books should be added?"
 msgstr "¿Cuantos libros vacios debe de estar aumentado?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:340
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:390
 msgid "Uploading books to device."
 msgstr "Enviando libros al dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:350
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:137
 msgid "Books"
 msgstr "Libros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
 msgid "EPUB Books"
 msgstr "Libros en EPUB"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
 msgid "LRF Books"
 msgstr "Libros en LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
 msgid "HTML Books"
 msgstr "Libros en HTML"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
 msgid "LIT Books"
 msgstr "Libros en LIT"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
 msgid "MOBI Books"
 msgstr "Libros en MOBI"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
 msgid "Topaz books"
 msgstr "Libros en formato topaz"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
 msgid "Text books"
 msgstr "Libros en formato texto"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:359
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
 msgid "PDF Books"
 msgstr "Libros en PDF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:359
 msgid "Comics"
 msgstr "Cómics"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:360
 msgid "Archives"
 msgstr "Archivos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:364
 msgid "Supported books"
 msgstr "Libros soportados"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:399
 msgid "Merged some books"
 msgstr "Se han unido algunos libros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:401
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:400
 msgid ""
 "Some duplicates were found and merged into the following existing books:"
 msgstr ""
 "Se han encontrado algunos libros duplicados y se han unido a los siguientes "
 "libros existentes:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:409
 msgid "Failed to read metadata"
 msgstr "Fallo leyendo metadatos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:410
 msgid "Failed to read metadata from the following"
 msgstr "Fallo leyendo metadatos de"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:434
 msgid "Add to library"
 msgstr "Añadir a la biblioteca"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:460
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1229
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:459
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1228
 msgid "No book selected"
 msgstr "No hay libros seleccionados"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:434
 msgid "No book files found"
 msgstr "No se han encontrado archivos de libros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:456
 msgid "Cannot delete"
 msgstr "No se puede borrar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:469
 msgid "Choose formats to be deleted"
 msgstr "Elegir formatos a borrar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:488
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:487
 msgid "Choose formats <b>not</b> to be deleted"
 msgstr "Elegir formatos que <b>no</b> hayan de ser borrados"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:507
 msgid "Cannot delete books"
 msgstr "No se pueden eliminar libros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:509
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:508
 msgid "No device is connected"
 msgstr "No hay ningún dispositivo conectado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:519
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:518
 msgid "Main memory"
 msgstr "Memoria principal"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:520
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:444
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:519
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:454
 msgid "Storage Card A"
 msgstr "Tarjeta de almacenamiento A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:521
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:446
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:455
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:447
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:456
 msgid "Storage Card B"
 msgstr "Tarjeta de almacenamiento B"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:525
 msgid "No books to delete"
 msgstr "No hay libros para eliminar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:526
 msgid "None of the selected books are on the device"
 msgstr "Ninguno de los libros seleccionados está en el dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:544
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:600
 msgid "Deleting books from device."
 msgstr "Eliminando libros del dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:564
 msgid ""
 "The selected books will be <b>permanently deleted</b> and the files removed "
 "from your computer. Are you sure?"
@@ -3296,7 +3358,7 @@ msgstr ""
 "Los libros seleccionados serán <b>eliminados permanentemente</b> y los "
 "ficheros borrados del equipo. ¿Está seguro?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:585
 msgid ""
 "The selected books will be <b>permanently deleted</b> from your device. Are "
 "you sure?"
@@ -3304,61 +3366,61 @@ msgstr ""
 "Los libros seleccionados se <b>borrarán permanentemente</b> del dispositivo. "
 "¿Está seguro?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:610
 msgid "Cannot download metadata"
 msgstr "No se pueden descargar los metadatos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:627
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
 msgid "social metadata"
 msgstr "metadatos sociales"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
 msgid "covers"
 msgstr "portadas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
 msgid "metadata"
 msgstr "metadatos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:630
 msgid "Downloading %s for %d book(s)"
 msgstr "Descargando %s para %d libro(s)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:654
 msgid "Failed to download some metadata"
 msgstr "No se pudieron descargar algunos metadatos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:656
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
 msgid "Failed to download metadata for the following:"
 msgstr "No se pudieron descargar metadatos para:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:659
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:658
 msgid "Failed to download metadata:"
 msgstr "No se pudieron descargar metadatos:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:660
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:637
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:522
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:949
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:659
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:638
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:951
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
 msgid "Error"
 msgstr "Error"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:670
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:707
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:669
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:706
 msgid "Cannot edit metadata"
 msgstr "No se pueden editar los metadatos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:728
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:731
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:727
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:730
 msgid "Cannot merge books"
 msgstr "No se pueden unir los libros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:732
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:731
 msgid "At least two books must be selected for merging"
 msgstr "Deben seleccionarse al menos dos libros para unirlos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:736
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:735
 msgid ""
 "All book formats and metadata from the selected books will be added to the "
 "<b>first selected book.</b><br><br> The second and subsequently selected "
@@ -3369,7 +3431,7 @@ msgstr ""
 "<b>primer libro seleccionado</b>.<br><br>El segundo libro y los siguientes "
 "no se borrarán ni se modificarán.<br><br>Confirme que quiere continuar."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:747
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:746
 msgid ""
 "All book formats and metadata from the selected books will be merged into "
 "the <b>first selected book</b>.<br><br>After merger the second and "
@@ -3385,52 +3447,52 @@ msgstr ""
 "se <b>borrará</b> de forma permanente de su ordenador.<br><br>¿Está "
 "<b>seguro</b> de que quiere continuar?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:759
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:758
 msgid ""
 "You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
 "proceed?"
 msgstr ""
 "Va a unir más de 5 libros. ¿Está <b>seguro</b> de que quiere continuar?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:876
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:875
 msgid "Cannot save to disk"
 msgstr "No se puede guardar en disco"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:878
 msgid "Choose destination directory"
 msgstr "Elegir directorio de destino"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:912
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:911
 msgid "Error while saving"
 msgstr "Error al guardar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:913
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:912
 msgid "There was an error while saving."
 msgstr "Hubo un error al guardar."
 
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:919
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:920
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:921
 msgid "Could not save some books"
 msgstr "No se pudieron guardar algunos libros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:922
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:921
 msgid "Click the show details button to see which ones."
 msgstr "Pulse el botón \"Mostrar detalles\" para ver cuáles."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
 msgid "No books selected to generate catalog for"
 msgstr "No se han seleccionado libros para generar el catálogo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:960
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:959
 msgid "Generating %s catalog..."
 msgstr "Generando catálogo %s..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:965
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:964
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:264
 msgid "No books found"
 msgstr "No se encontró ningún libro"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:966
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:965
 msgid ""
 "No books to catalog\n"
 "Check exclude tags"
@@ -3438,49 +3500,49 @@ msgstr ""
 "No hay libros para incluir en el catálogo\n"
 "Compruebe la exclusión de etiquetas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:976
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:975
 msgid "Catalog generated."
 msgstr "Catálogo generado."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:979
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:978
 msgid "Export Catalog Directory"
 msgstr "Directorio para exportar catálogos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:980
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:979
 msgid "Select destination for %s.%s"
 msgstr "Seleccionar destino para %s.%s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:996
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:995
 msgid "Fetching news from "
 msgstr "Obteniendo noticias de "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1009
 msgid " fetched."
 msgstr " obtenidas."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1059
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1058
 msgid "Cannot convert"
 msgstr "No se puede convertir"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1088
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1087
 msgid "Starting conversion of %d book(s)"
 msgstr "Iniciando la conversión de %d libro(s)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1265
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1264
 msgid "Cannot view"
 msgstr "No se puede visualizar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1209
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
 msgid "Choose the format to view"
 msgstr "Elija el formato para visualizar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1218
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1217
 msgid "Multiple Books Selected"
 msgstr "Varios libros seleccionados"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1219
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1218
 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 "
@@ -3492,11 +3554,11 @@ msgstr ""
 "equipo. Una vez comenzado el proceso no puede deterse hasta que se complete. "
 "¿Desea continuar?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1227
 msgid "Cannot open folder"
 msgstr "No se puede abrir la carpeta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1266
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1265
 msgid "%s has no available formats."
 msgstr "%s no tiene formatos disponibles."
 
@@ -3521,7 +3583,7 @@ msgid "The specified directory could not be processed."
 msgstr "El directorio especificado no se puede procesar."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:845
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr "Sin libros"
 
@@ -3659,15 +3721,15 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:52
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:633
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:637
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:366
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:371
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:385
@@ -3691,12 +3753,12 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:259
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:265
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:186
@@ -3730,8 +3792,9 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:313
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1059
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1065
 msgid "Path"
 msgstr "Ruta"
 
@@ -3748,8 +3811,8 @@ msgid "Formats"
 msgstr "Formatos"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:25
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:886
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1062
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:891
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1068
 msgid "Collections"
 msgstr "Colecciones"
 
@@ -3762,12 +3825,12 @@ msgstr "Clic para abrir"
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:305
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:311
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:317
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1068
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1072
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1074
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:458
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:274
 msgid "None"
 msgstr "Ninguno"
 
@@ -4661,12 +4724,12 @@ msgid "Footer regular expression:"
 msgstr "Expresión regular para pies de página:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:56
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:76
 msgid "Invalid regular expression"
 msgstr "Expresión regular no válida"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:77
 msgid "Invalid regular expression: %s"
 msgstr "Expresión regular no valida: %s"
 
@@ -4888,11 +4951,11 @@ msgstr ""
 "<p>Para usos más avanzados de XPath, véase el <a href=\"http://calibre-"
 "ebook.com/user_manual/xpath.html\">Tutorial de XPathl</a>.</p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:127
 msgid "Cover browser could not be loaded"
 msgstr "No se ha podido cargar el explorador de portadas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:179
 msgid "Browse by covers"
 msgstr "Explorar por portadas"
 
@@ -4951,124 +5014,124 @@ msgstr "etiquetas a añadir"
 msgid "tags to remove"
 msgstr "etiquetas a eliminar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:49
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:135
 msgid "No details available."
 msgstr "No hay detalles disponibles."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:155
 msgid "Device no longer connected."
 msgstr "El dispositivo ya no esta conectado."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:270
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:271
 msgid "Get device information"
 msgstr "Obtener información del dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:282
 msgid "Get list of books on device"
 msgstr "Obtener lista de libros en el dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:292
 msgid "Get annotations from device"
 msgstr "Obtener anotaciones del dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:301
 msgid "Send metadata to device"
 msgstr "Enviar metadatos al dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:305
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:306
 msgid "Send collections to device"
 msgstr "Enviar colecciones al dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:330
 msgid "Upload %d books to device"
 msgstr "Pasar %d libros al dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:345
 msgid "Delete books from device"
 msgstr "Borrar libros del dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:362
 msgid "Download books from device"
 msgstr "Obtener libros del dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:372
 msgid "View book on device"
 msgstr "Ver libro en el dispositvo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:408
 msgid "Set default send to device action"
 msgstr "Asignar acción de enviar al dispositivo por defecto"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:413
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:420
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:422
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:425
 msgid "Email to"
 msgstr "Enviar por correo electrónico a"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:425
 msgid " and delete from library"
 msgstr " y elimínalo desde la librería"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:434
 msgid "Send to main memory"
 msgstr "Enviar a la memoria principal"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:436
 msgid "Send to storage card A"
 msgstr "Enviar a la tarjeta de memoria A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:437
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:438
 msgid "Send to storage card B"
 msgstr "Enviar a la tarjeta de memoria B"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:442
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:452
 msgid "Main Memory"
 msgstr "Memoria principal"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:469
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:470
 msgid "Send and delete from library"
 msgstr "Enviar y eliminar de la biblioteca"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:471
 msgid "Send specific format"
 msgstr "Enviar formato específico"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:509
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:510
 msgid "Connect to folder"
 msgstr "Conectar a carpeta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:516
 msgid "Connect to iTunes"
 msgstr "Conectar a iTunes"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:521
 msgid "Eject device"
 msgstr "Desconectar dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:529
 msgid "Fetch annotations (experimental)"
 msgstr "Obtener anotaciones (experimental)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:638
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:639
 msgid "Error communicating with device"
 msgstr "Error en la comunicación con el dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:659
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:660
 msgid "Select folder to open as device"
 msgstr "Seleccionar carpeta para abrir como un dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:704
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:705
 msgid "Failed"
 msgstr "Falló"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:710
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:711
 msgid "Error talking to device"
 msgstr "Error de comunicación con el dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:711
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:712
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -5076,128 +5139,124 @@ msgstr ""
 "Hubo un error de comunicación con el dispositivo. Desconecte y vuelva a "
 "conectar el dispositivo o reinicie la aplicación."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:753
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:754
 msgid "Device: "
 msgstr "Dispositivo: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:755
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:756
 msgid " detected."
 msgstr " detectado."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:778
-msgid "Connected "
-msgstr "Conectado "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:846
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr "elegido para enviar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:851
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:847
 msgid "Choose format to send to device"
 msgstr "Elige el formato para enviar al dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:860
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:856
 msgid "No device"
 msgstr "Sin dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:857
 msgid "Cannot send: No device is connected"
 msgstr "No se pudo enviar: no hay ningún dispositivo conectado"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:860
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:868
 msgid "No card"
 msgstr "Sin tarjeta"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:869
 msgid "Cannot send: Device has no storage card"
 msgstr "No se pudo enviar: el dispositivo no tiene tarjeta de memoria"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:910
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:906
 msgid "E-book:"
 msgstr "Libro electrónico:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:913
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:909
 msgid "Attached, you will find the e-book"
 msgstr "El libro electrónico está adjunto"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:910
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:181
 msgid "by"
 msgstr "por"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:915
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:911
 msgid "in the %s format."
 msgstr "en el formato %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:928
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:924
 msgid "Sending email to"
 msgstr "Enviando correo electrónico a"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:958
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:965
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1057
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1118
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1236
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:954
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:962
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1054
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1235
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:1243
 msgid "No suitable formats"
 msgstr "No hay formatos adecuados"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:959
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:955
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 "¿Convertir automáticamente los siguientes libros antes de enviar por correo "
 "electrónico?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:966
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:963
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 "No se pudieron enviar por correo electrónico los siguientes libros porque no "
 "se encontraron formatos compatibles:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:984
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:981
 msgid "Failed to email books"
 msgstr "Fallo al enviar libros por correo electrónico"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:985
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:982
 msgid "Failed to email the following books:"
 msgstr "Fallo al enviar por correo electrónico los siguientes libros:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:989
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:986
 msgid "Sent by email:"
 msgstr "Enviado por correo electrónico:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1016
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1013
 msgid "News:"
 msgstr "Noticias:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1017
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1014
 msgid "Attached is the"
 msgstr "Adjunto está el"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1028
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1025
 msgid "Sent news to"
 msgstr "Enviar noticias a"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1058
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1237
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1055
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1117
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1236
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 "¿Convertir automáticamente los siguientes libros antes de pasarlos al "
 "dispositivo?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1087
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1085
 msgid "Sending catalogs to device."
 msgstr "Enviando catálogos al dispositivo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1150
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1149
 msgid "Sending news to device."
 msgstr "Enviando noticias al dispositivo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1202
 msgid "Sending books to device."
 msgstr "Enviando libros al dispositivo."
 
@@ -5256,7 +5315,7 @@ msgid "My Books"
 msgstr "Mis libros"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:69
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:289
 msgid "Generate catalog"
 msgstr "Generar el catálogo"
 
@@ -5404,11 +5463,11 @@ msgstr "Ancho"
 msgid "Narrow"
 msgstr "Estrecho"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:503
 msgid "System port selected"
 msgstr "Puerto de sistema seleccionado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:503
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:504
 msgid ""
 "The value <b>%d</b> you have chosen for the content server port is a system "
 "port. Your operating system <b>may</b> not allow the server to run on this "
@@ -5419,131 +5478,131 @@ msgstr ""
 "permita que el servidor ocupe este puerto. Para estar seguro, elija un "
 "número de puerto mayor de 1024."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:524
 msgid "Failed to install command line tools."
 msgstr "Fallo al instalar las herramientas de línea de órdenes."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:527
 msgid "Command line tools installed"
 msgstr "Herramientas de línea de órdenes instaladas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:528
 msgid "Command line tools installed in"
 msgstr "Herramientas de línea de órdenes instaladas en"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:529
 msgid ""
 "If you move calibre.app, you have to re-install the command line tools."
 msgstr ""
 "Si mueve calibre.app, deberá reinstalar las herramientas de línea de órdenes."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:580
 msgid "No valid plugin path"
 msgstr "No hay ninguna ruta de complementos válida"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:581
 msgid "%s is not a valid plugin path"
 msgstr "%s no es una ruta de complementos válida"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:584
 msgid "Choose plugin"
 msgstr "Elegir complemento"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:596
 msgid "Plugin cannot be disabled"
 msgstr "El complemento no puede desactivarse"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:597
 msgid "The plugin: %s cannot be disabled"
 msgstr "El complemento: %s no puede desactivarse"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:606
 msgid "Plugin not customizable"
 msgstr "Complemento no personalizable"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:607
 msgid "Plugin: %s does not need customization"
 msgstr "Complemento: %s no necesita personalización"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:615
 msgid "Customize"
 msgstr "Personalizar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:652
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:653
 msgid "Cannot remove builtin plugin"
 msgstr "No se puede eliminar el complemento incorporado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:653
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:654
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 " no puede eliminarse. Es un complemento incorporado. Intente desactivarlo en "
 "su lugar."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:684
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:685
 msgid "You must select a column to delete it"
 msgstr "Debe seleccionar una columna para borrarla"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:690
 msgid "The selected column is not a custom column"
 msgstr "La columna seleccionada no es una columna personalizada"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:690
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:691
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
 msgid "Are you sure?"
 msgstr "¿Está seguro?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:691
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:692
 msgid "Do you really want to delete column %s and all its data?"
 msgstr "¿Seguro que quiere borrar la columna %s y todos sus datos?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:758
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:759
 msgid "Error log:"
 msgstr "Registro de errores:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:765
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:766
 msgid "Access log:"
 msgstr "Registro de accesos:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:793
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:794
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:331
 msgid "Failed to start content server"
 msgstr "Fallo al iniciar el servidor de contenidos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:817
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:818
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:587
 msgid "Select location for books"
 msgstr "Seleccionar ubicación para los libros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:824
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:825
 msgid "Invalid size"
 msgstr "Tamaño no válido"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:825
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:826
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr "El tamaño %s no es válido. Debe ser de la forma anchuraxaltura"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:884
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:889
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:891
 msgid "Invalid database location"
 msgstr "Ubicación de la base de datos no válida"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:885
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:887
 msgid "Invalid database location "
 msgstr "Ubicación de la base de datos no válida "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:888
 msgid "<br>Must be a directory."
 msgstr "<br>Debe ser un directorio."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:890
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:892
 msgid "Invalid database location.<br>Cannot write to "
 msgstr "Ubicación de la base de datos no válida.<br>Imposible escribir en "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:895
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:897
 msgid "Must restart"
 msgstr "Hay que reiniciar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:896
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:898
 msgid ""
 "The changes you made require that Calibre be restarted. Please restart as "
 "soon as practical."
@@ -5551,19 +5610,19 @@ msgstr ""
 "Los cambios realizados requieren que calibre vuelva a iniciarse. Por favor "
 "reinicie en cuanto le sea práctico."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:930
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:932
 msgid "Checking database integrity"
 msgstr "Comprobando la integridad de la base de datos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:950
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:952
 msgid "Failed to check database integrity"
 msgstr "Fallo al comprobar la integridad de la base de datos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:957
 msgid "Some inconsistencies found"
 msgstr "Se encontraron incoherencias"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:956
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:958
 msgid ""
 "The following books had formats listed in the database that are not actually "
 "available. The entries for the formats have been removed. You should check "
@@ -5575,11 +5634,11 @@ msgstr ""
 "eliminado. Debería comprobarlos manualmente. Esto puede ocurrir si manipula "
 "los ficheros de la carpeta de la biblioteca directamente."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:133
 msgid "TabWidget"
 msgstr "TabWidget"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:134
 msgid ""
 "Here you can control how calibre will read metadata from the files you add "
 "to it. calibre can either read metadata from the contents of the file, or "
@@ -5589,11 +5648,11 @@ msgstr ""
 "se añaden. calibre puede leer los metadatos del contenido del fichero o de "
 "su nombre."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:135
 msgid "Read metadata only from &file name"
 msgstr "Leer metadatos sólo del nombre de &fichero"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:136
 msgid ""
 "Swap the firstname and lastname of the author. This affects only metadata "
 "read from file names."
@@ -5601,11 +5660,11 @@ msgstr ""
 "Intercambiar el nombre y el apellido del autor. Esto sólo afecta a los "
 "metadatos extraídos de nombres de ficheros."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:137
 msgid "&Swap author firstname and lastname"
 msgstr "&Intercambiar nombre y apellido del autor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:138
 msgid ""
 "If an existing book with a similar title and author is found that does not "
 "have the format being added, the format is added\n"
@@ -5625,7 +5684,7 @@ msgstr ""
 "\"a\", \"an\"), puntuación, mayúsculas o minúsculas, etc. La comparación de "
 "autores es exacta."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:142
 msgid ""
 "If books with similar titles and authors found, &merge the new files "
 "automatically"
@@ -5633,15 +5692,15 @@ msgstr ""
 "Si se encuentran libros con el mismo título y autor, &unir automáticamente "
 "los nuevos ficheros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:143
 msgid "&Configure metadata from file name"
 msgstr "&Configurar los metadatos a partir del nombre de fichero"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:144
 msgid "&Adding books"
 msgstr "&Añadir libros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:145
 msgid ""
 "Here you can control how calibre will save your books when you click the "
 "Save to Disk button:"
@@ -5649,65 +5708,70 @@ msgstr ""
 "Aquí puede controlar cómo guardará calibre los libros cuando se pulse el "
 "botón Guardar a disco:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:146
 msgid "Save &cover separately"
 msgstr "Guardar la &portada por separado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:147
 msgid "Update &metadata in saved copies"
 msgstr "Actualizar los &metadatos de las copias guardadas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:148
 msgid "Save metadata in &OPF file"
 msgstr "Guardar los metadatos en un fichero &OPF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:149
 msgid "Convert non-English characters to &English equivalents"
 msgstr "Convertir los caracteres no ASCII a &equivalentes ASCII"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:150
 msgid "Format &dates as:"
 msgstr "Escribir fec&has con formato:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:151
 msgid "File &formats to save:"
 msgstr "Guardar ficheros en &formatos:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:152
 msgid "Replace space with &underscores"
 msgstr "Sustituir espacios por guiones ba&jos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:153
 msgid "Change paths to &lowercase"
 msgstr "Cambiar rutas a mi&núsculas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:154
 msgid "&Saving books"
 msgstr "&Guardar libros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:135
-msgid "Preserve device collections."
-msgstr "Mantiene las colecciones del dispositivo"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:155
+msgid "Metadata &management:"
+msgstr "Gestión de &metadatos:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:156
+msgid "Manual management"
+msgstr "Gestión manual"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:157
+msgid "Only on send"
+msgstr "Sólo al enviar"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:158
+msgid "Automatic management"
+msgstr "Gestión automática"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:159
 msgid ""
-"If checked, collections will not be deleted even if a book with changed "
-"metadata is resent and the collection is not in the book's metadata. In "
-"addition, editing collections in the device view will be enabled. If "
-"unchecked, collections will be always reflect only the metadata in the "
-"calibre library."
+"<li><b>Manual Management</b>: Calibre updates the metadata and adds "
+"collections only when a book is sent. With this option, calibre will never "
+"remove a collection.</li>\n"
+"<li><b>Only on send</b>: Calibre updates metadata and adds/removes "
+"collections for a book only when it is sent to the device. </li>\n"
+"<li><b>Automatic management</b>: Calibre automatically keeps metadata on the "
+"device in sync with the calibre library, on every connect</li></ul>"
 msgstr ""
-"Si se activa, las colecciones no se borrarán incluso si un libro con los "
-"metadatos modificados se vuelve a enviar y la colección no está en los "
-"metadatos del libro. Además, se hace posible editar las colecciones en la "
-"vista del dispositivo. Si se desactiva, las colecciones corresponderán "
-"siempre a los metadatos en la biblioteca de calibre."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:137
-msgid "  "
-msgstr "  "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:162
 msgid ""
 "Here you can control how calibre will save your books when you click the "
 "Send to Device button. This setting can be overriden for individual devices "
@@ -5718,18 +5782,19 @@ msgstr ""
 "los dispositivos concretos si se personaliza los complementos de interfaz de "
 "dispositivo en Preferencias -> Complementos."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:163
 msgid "Sending to &device"
 msgstr "Enviar a &dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:167
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:174
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
@@ -5738,28 +5803,28 @@ msgstr ""
 "en carpetas ordenadas por autor, los metadatos se almacenan en el fichero "
 "metadata.db)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
 msgid "Browse for the new database location"
 msgstr "Seleccionar la nueva ubicación de la base de datos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
 msgid "Show notification when &new version is available"
 msgstr "Mostrar un aviso cuando haya una &nueva versión disponible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
 msgid "Download &social metadata (tags/ratings/etc.) by default"
 msgstr ""
 "Descargar metadatos &sociales (etiquetas/valoraciones/etc...) por defecto"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
 msgid "&Overwrite author and title by default when fetching metadata"
 msgstr "&Reemplazar el autor y el título al adquirir metadatos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
 msgid "Default network &timeout:"
 msgstr "&Tiempo de espera máximo por defecto de la red:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
@@ -5767,157 +5832,161 @@ msgstr ""
 "Establecer el tiempo de espera maximo para peticiones de red (cada vez que "
 "se conecte a Internet para adquirir alguna información)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
 msgid " seconds"
 msgstr " segundos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
 msgid "Choose &language (requires restart):"
 msgstr "Se&leccionar idioma (requiere reiniciar el programa):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
 msgid "Normal"
 msgstr "Normal"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
 msgid "High"
 msgstr "Alta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
 msgid "Low"
 msgstr "Baja"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
 msgid "Job &priority:"
 msgstr "&Prioridad de tareas:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
 msgid "Preferred &output format:"
 msgstr "F&ormato de salida preferente:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
 msgid "Preferred &input format order:"
 msgstr "Orden de preferenc&ia de formatos de entrada:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
 msgid "Use &Roman numerals for series number"
 msgstr "Uso de números &romanos para los números dentro de una serie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
 msgid "Enable system &tray icon (needs restart)"
 msgstr "Activar &icono en bandeja del sistema (requiere reinicio)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
 msgid "Show &notifications in system tray"
 msgstr "Mostrar &noticaciones en la bandeja del sistema"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
 msgid "Show &splash screen at startup"
 msgstr "Mostrar pantalla de bien&venida al inicio"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 "Mostrar explorador de &portadas en ventana separada (requiere reinicio)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
 msgid "Show &average ratings in the tags browser"
 msgstr "Mostrar calificaciones &promedio en el explorador de etiquetas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
 msgid "Search as you type"
 msgstr "&Buscar mientras se escribe"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr ""
 "Enviar noticias &descargadas automáticamente al lector de libros electrónicos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
 msgid "&Delete news from library when it is automatically sent to reader"
 msgstr ""
 "&Eliminar noticias de la biblioteca cuando se hayan enviado automáticamente "
 "al lector."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr "Nú&mero de portadas a mostrar en el explorador (requiere reinicio):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
 msgid "Toolbar"
 msgstr "Barra de herramientas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
 msgid "Large"
 msgstr "Grande"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
 msgid "Medium"
 msgstr "Medio"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
 msgid "Small"
 msgstr "Pequeño"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
 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/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
 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/config_ui.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
 msgid "Select visible &columns in library view"
 msgstr "Seleccione las &columnas visibles en la vista de la biblioteca"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
 msgid "Remove a user-defined column"
 msgstr "Eliminar una columna definida por el usuario"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
 msgid "Add a user-defined column"
 msgstr "Añadir una columna definida por el usuario"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
 msgid "Edit settings of a user-defined column"
 msgstr "Editar la configuración de una columna definida por el usuario"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
 msgid "Use internal &viewer for:"
 msgstr "&Usar visor interno para:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
 msgid "User Interface &layout (needs restart):"
 msgstr "Interfaz de usuario &diseño (necesario reiniciar):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 "Desactiva todas las animaciones. Útil si tiene un ordenador lento o antiguo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
 msgid "Disable &animations"
 msgstr "Desactivar &animaciones"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
+msgid "Show &donate button (restart)"
+msgstr "Mostrar botón de &donar (reinicia)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
 msgid "Add an email address to which to send books"
 msgstr ""
 "Añadir una dirección de correo electrónico a la que se enviarán los libros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
 msgid "&Add email"
 msgstr "&Añadir correo electrónico"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
 msgid "Make &default"
 msgstr "Asignar como pre&determinada"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
 msgid "&Remove email"
 msgstr "E&liminar correo electrónico"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
 msgid ""
 "calibre can send your books to you (or your reader) by email. Emails will be "
 "automatically sent for downloaded news to all email addresses that have Auto-"
@@ -5927,33 +5996,33 @@ msgstr ""
 "Se enviarán correos automáticamente con las noticias descargadas a todas las "
 "direcciones que tengan la opción de envío automático marcada."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
 msgid "&Maximum number of waiting worker processes (needs restart):"
 msgstr "&Número máximo de procesos en espera (necesita reiniciar):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
 msgid "&Check database integrity"
 msgstr "&Comprobar la integridad de la base de datos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
 msgid "&Install command line tools"
 msgstr "Instalar &herramientas de línea de órdenes"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
 msgid "Open calibre &configuration directory"
 msgstr "&Abrir el directorio de configuración de calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
 msgid "Limit the max. simultaneous jobs to the available CPU &cores"
 msgstr ""
 "&Limitar el número máximo de tareas simultáneas al número de núcleos de CPU "
 "disponibles."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
 msgid "Debug &device detection"
 msgstr "&Depurar detección de dispositivos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
 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 "
@@ -5964,25 +6033,25 @@ msgstr ""
 "en las preferencias tendrá efecto sólo después de que se reinicie el "
 "servidor."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
 msgid "Server &port:"
 msgstr "&Puerto del servidor:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:212
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:117
 msgid "&Username:"
 msgstr "&Usuario:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:213
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:119
 msgid "&Password:"
 msgstr "Cont&raseña:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
@@ -5990,7 +6059,7 @@ msgstr ""
 "Si se deja la contraseña en blanco, cualquiera podrá acceder a su colección "
 "de libros a través la interfaz web."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
@@ -5998,45 +6067,45 @@ msgstr ""
 "El tamaño máximo (anchura × altura) con el que se mostrarán las portadas. "
 "Las portadas mayores se redimensionarán. "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
 msgid "Max. &cover size:"
 msgstr "&Tamaño máximo de portada:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:621
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:214
 msgid "&Show password"
 msgstr "&Mostrar contraseña"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
 msgid "Max. &OPDS items per query:"
 msgstr "Número máximo de elementos &OPDS por consulta:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
 msgid "Max. OPDS &ungrouped items:"
 msgstr "&Máximo número de elementos OPDS sin agrupar:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
 msgid "&Start Server"
 msgstr "&Iniciar servidor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:621
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
 msgid "St&op Server"
 msgstr "&Detener servidor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:626
 msgid "&Test Server"
 msgstr "Pro&bar servidor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
 msgid "Run server &automatically on startup"
 msgstr "Ejecutar servidor &automáticamente al iniciar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:628
 msgid "View &server logs"
 msgstr "Ver registros del &servidor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:46
 msgid ""
 "<p>Remember to leave calibre running as the server only runs as long as "
@@ -6053,7 +6122,7 @@ msgstr ""
 "el lector Stanza de su iPhone, donde miservidor es el nombre de servidor "
 "completo o la dirección IP del equipo donde se ejecuta calibre."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:631
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
@@ -6061,27 +6130,27 @@ msgstr ""
 "Aquí puede personalizar el comportamiento de calibre controlando qué "
 "complementos usa."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:628
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:632
 msgid "Enable/&Disable plugin"
 msgstr "Activar/&Desactivar complemento"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:633
 msgid "&Customize plugin"
 msgstr "&Personalizar complemento"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:630
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:634
 msgid "&Remove plugin"
 msgstr "&Eliminar complemento"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:635
 msgid "Add new plugin"
 msgstr "Añadir nuevo complemento"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:632
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:636
 msgid "Plugin &file:"
 msgstr "&Fichero de complemento:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:634
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:638
 msgid "&Add"
 msgstr "&Añadir"
 
@@ -6119,9 +6188,9 @@ msgstr "Número"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:31
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:884
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:889
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Date"
 msgstr "Fecha"
@@ -6337,12 +6406,20 @@ msgstr "&Mostrar este aviso otra vez"
 msgid "ERROR"
 msgstr "ERROR"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:67
+msgid ""
+"All checked books will be <b>permanently deleted</b> from your device. "
+"Please verify the list."
+msgstr ""
+"Todos los libros seleccionados serán <b>eliminados permanentemente</b> de su "
+"dispositivo. Por favor, comprueba la lista."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 msgid "Location"
 msgstr "Ubicación"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1058
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1064
 msgid "Format"
 msgstr "Formato"
 
@@ -7201,6 +7278,10 @@ msgstr ""
 "Añadir etiqueta a la lista de etiquetas disponibles y aplicarla al libro "
 "actual"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:20
+msgid "%s (was %s)"
+msgstr "%s (era %s)"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:501
 msgid "Item is blank"
@@ -7528,11 +7609,11 @@ msgstr "Expresión regular (?P&lt;title&gt;)"
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:88
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:93
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:98
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:100
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:99
 msgid "No match"
 msgstr "No hay coincidencias"
 
@@ -7572,43 +7653,43 @@ msgstr "Expresión regular (?P<isbn>)"
 msgid "Save single format to disk..."
 msgstr "Guardar un solo formato en disco..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:53
 msgid "Edit metadata individually"
 msgstr "Editar metadatos por separado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:56
 msgid "Edit metadata in bulk"
 msgstr "Edita metadatos en bloque"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:59
 msgid "Download metadata and covers"
 msgstr "Descargar metadatos y portadas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:62
 msgid "Download only metadata"
 msgstr "Descargar sólo los metadatos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:64
 msgid "Download only covers"
 msgstr "Descargar sólo las portadas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:67
 msgid "Download only social metadata"
 msgstr "Descargar sólo metadatos sociales"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:73
 msgid "Merge into first selected book - delete others"
 msgstr "Unir en el primer libro seleccionado - borrar el resto"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:76
 msgid "Merge into first selected book - keep others"
 msgstr "Unir en el primer libro seleccionado - mantener el resto"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:84
 msgid "Add books from a single directory"
 msgstr "Añadir libros desde un único directorio"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:86
 msgid ""
 "Add books from directories, including sub-directories (One book per "
 "directory, assumes every ebook file is the same book in a different format)"
@@ -7617,7 +7698,7 @@ msgstr ""
 "directorio, se asume que cada fichero de libro electrónico es el mismo libro "
 "en diferente formato."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:90
 msgid ""
 "Add books from directories, including sub directories (Multiple books per "
 "directory, assumes every ebook file is a different book)"
@@ -7626,98 +7707,116 @@ msgstr ""
 "por directorio, se asume que cada fichero de libro electrónico es un libro "
 "diferente."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:93
 msgid "Add Empty book. (Book entry with no formats)"
 msgstr "Añadir libro en blanco. (Entrada de libro sin ningún formato)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:102
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:160
 msgid "Save to disk"
 msgstr "Guardar en el disco"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Save to disk in a single directory"
 msgstr "Guardar en el disco, en un único directorio"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:106
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:402
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:393
 msgid "Save only %s format to disk"
 msgstr "Guardar solamente el formato %s en disco"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:110
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:396
 msgid "Save only %s format to disk in a single directory"
 msgstr "Guardar sólo el formato %s en un único directorio"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:119
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:166
 msgid "View"
 msgstr "Mostrar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:121
 msgid "View specific format"
 msgstr "Mostrar un formato específico"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:127
 msgid "Remove selected books"
 msgstr "Eliminar libros seleccionados"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:129
 msgid "Remove files of a specific format from selected books.."
 msgstr "Eliminar formatos específicos de los libros seleccionados.."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:132
 msgid "Remove all formats from selected books, except..."
 msgstr "Eliminar todos los formatos de los libros seleccionados, excepto..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:135
 msgid "Remove covers from selected books"
 msgstr "Eliminar portadas de los libros seleccionados"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:138
 msgid "Remove matching books from device"
 msgstr "Eliminar los libros que correspondan del dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:155
 msgid "Convert individually"
 msgstr "Convertir por separado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:157
 msgid "Bulk convert"
 msgstr "Convertir en bloque"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:161
 msgid "Create catalog of books in your calibre library"
 msgstr "Crear catálogo de los libros en la biblioteca de calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:169
 msgid "Run welcome wizard"
 msgstr "Ejecutar el asistente de bienvenida"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:191
 msgid "Similar books..."
 msgstr "Libros similares..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:223
 msgid "Add books to library"
 msgstr "Añadir libros a la biblioteca"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:234
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:241
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:239
 msgid "Manage collections"
 msgstr "Administrar colecciones"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:328
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:319
 msgid "Cover Browser"
 msgstr "Explorador de portadas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:337
 msgid "Tag Browser"
 msgstr "Navegador de etiquetas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:358
+msgid "version"
+msgstr "versión"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:359
+msgid "created by Kovid Goyal"
+msgstr "creado por Kovid Goyal"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:377
+msgid "Connected "
+msgstr "Conectado "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:386
+msgid "Update found"
+msgstr "Actualización encontrada"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:430
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:439
 msgid "Book Details"
 msgstr "Detalles del Libro"
 
@@ -7780,6 +7879,227 @@ msgstr "Pulse para ver las tareas activas."
 msgid " - Jobs"
 msgstr " - tareas"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:64
+msgid ""
+"Library\n"
+"%d books"
+msgstr ""
+"Biblioteca\n"
+"%d libros"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:65
+msgid ""
+"Reader\n"
+"%s"
+msgstr ""
+"Lector\n"
+"%s"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:66
+msgid ""
+"Card A\n"
+"%s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:67
+msgid ""
+"Card B\n"
+"%s"
+msgstr ""
+"Tarjeta B\n"
+"%s"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:71
+msgid "Click to see the books available on your computer"
+msgstr "Pulsar para ver los libros disponibles en el equipo"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:74
+msgid "Click to see the books in the main memory of your reader"
+msgstr "Pulsar para ver los libros en la memoria principal del lector"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:75
+msgid "Click to see the books on storage card A in your reader"
+msgstr "Pulsar para ver los libros en la tarjeta de memoria A del lector"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:76
+msgid "Click to see the books on storage card B in your reader"
+msgstr "Pulsar para ver los libros en la tarjeta de memoria B del lector"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:84
+msgid "Books located at"
+msgstr "Libros ubicados en"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:100
+msgid "free"
+msgstr "libre"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:134
+msgid ""
+"Books display will be restricted to those matching the selected saved search"
+msgstr "Sólo se mostrarán los libros que coincidan con la búsqueda guardada"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:136
+msgid "Advanced search"
+msgstr "Búsqueda avanzada"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:141
+msgid ""
+"<p>Search the list of books by title, author, publisher, tags, comments, "
+"etc.<br><br>Words separated by spaces are ANDed"
+msgstr ""
+"Buscar en la lista de libros por título, autor, editorial, etiquetas, "
+"comentarios, etc.<br><br>Se buscan libros que contengan todas las palabras "
+"separadas por espacios"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:142
+msgid "Reset Quick Search"
+msgstr "Reiniciar la búsqueda rápida"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:328
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:144
+msgid "Copy current search text (instead of search name)"
+msgstr "Copiar el texto de búsqueda actual (en vez del nombre de búsqueda)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:146
+msgid "Save current search under the name shown in the box"
+msgstr "Guardar la búsqueda actual con el nombre mostrado en el recuadro"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:148
+msgid "Delete current saved search"
+msgstr "Borrar la búsqueda guardada actual"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:150
+msgid "Add books"
+msgstr "Añadir libros"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:151
+msgid "A"
+msgstr "A"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:153
+msgid "Remove books"
+msgstr "Eliminar libros"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:154
+msgid "Del"
+msgstr "Supr"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:406
+msgid "Edit meta info"
+msgstr "Editar metainformación"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:406
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:156
+msgid "E"
+msgstr "E"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:157
+msgid "Merge book records"
+msgstr "Unir registros de libros"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:158
+msgid "M"
+msgstr "M"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:159
+msgid "Send to device"
+msgstr "Enviar al dispositivo"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:161
+msgid "S"
+msgstr "S"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:162
+msgid "Fetch news"
+msgstr "Descargar noticias (RSS)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:163
+msgid "F"
+msgstr "F"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:164
+msgid "Convert books"
+msgstr "Convertir libros"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:165
+msgid "C"
+msgstr "C"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:167
+msgid "V"
+msgstr "V"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:168
+msgid "Open containing folder"
+msgstr "Abrir la carpeta que lo contiene"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:169
+msgid "Show book details"
+msgstr "Mostrar detalles del libro"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:170
+msgid "Books by same author"
+msgstr "Libros del mismo autor"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:171
+msgid "Books in this series"
+msgstr "Libros de la misma serie"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:172
+msgid "Books by this publisher"
+msgstr "Libros de la misma editorial"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:173
+msgid "Books with the same tags"
+msgstr "Libros con las mismas etiquetas"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:176
+msgid "Ctrl+P"
+msgstr "Ctrl+P"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:177
+msgid "Help"
+msgstr "Ayuda"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:178
+msgid "Browse the calibre User Manual"
+msgstr "Explorar el manual de usuario de calibre"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:179
+msgid "F1"
+msgstr "F1"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:284
 msgid "N"
 msgstr "N"
@@ -7801,29 +8121,29 @@ msgid "Rating"
 msgstr "Valoración"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:324
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1084
 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/models.py:674
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1176
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1182
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
 msgid "The lookup/search name is \"{0}\""
 msgstr "El nombre de búsqueda es \"{0}\""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:886
 msgid "In Library"
 msgstr "En la biblioteca"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:885
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:890
 msgid "Size"
 msgstr "Tamaño"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1156
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1162
 msgid "Marked for deletion"
 msgstr "Marcado para borrarlo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1165
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr "Doble clic para <b>editarme</b><br><br>"
 
@@ -7867,11 +8187,11 @@ msgstr "Mostrar columna"
 msgid "Restore default layout"
 msgstr "Restaurar formato por defecto"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:524
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:525
 msgid "Not allowed"
 msgstr "No permitido"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:526
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
@@ -8081,159 +8401,34 @@ msgstr "inténtelo después de reiniciar el equipo."
 msgid "try deleting the file"
 msgstr "pruebe a borrar el fichero"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:131
 msgid "calibre"
 msgstr "calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:133
 msgid "&Restrict to:"
 msgstr "Restringir a:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
-msgid ""
-"Books display will be restricted to those matching the selected saved search"
-msgstr "Sólo se mostrarán los libros que coincidan con la búsqueda guardada"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:135
 msgid "set in ui.py"
 msgstr "ajustado en ui.py"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
-msgid "Advanced search"
-msgstr "Búsqueda avanzada"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:138
 msgid "Alt+S"
 msgstr "Alt+S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:139
 msgid "&Search:"
 msgstr "&Buscar:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
-msgid ""
-"<p>Search the list of books by title, author, publisher, tags, comments, "
-"etc.<br><br>Words separated by spaces are ANDed"
-msgstr ""
-"Buscar en la lista de libros por título, autor, editorial, etiquetas, "
-"comentarios, etc.<br><br>Se buscan libros que contengan todas las palabras "
-"separadas por espacios"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
-msgid "Reset Quick Search"
-msgstr "Reiniciar la búsqueda rápida"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
-msgid "Choose saved search or enter name for new saved search"
-msgstr ""
-"Elija una búsqueda guardada o asigne un nombre para guardar la nueva búsqueda"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
-msgid "Copy current search text (instead of search name)"
-msgstr "Copiar el texto de búsqueda actual (en vez del nombre de búsqueda)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
-msgid "Save current search under the name shown in the box"
-msgstr "Guardar la búsqueda actual con el nombre mostrado en el recuadro"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
-msgid "Delete current saved search"
-msgstr "Borrar la búsqueda guardada actual"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
-msgid "Add books"
-msgstr "Añadir libros"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
-msgid "A"
-msgstr "A"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
-msgid "Remove books"
-msgstr "Eliminar libros"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
-msgid "Del"
-msgstr "Supr"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:155
 msgid "Edit meta information"
 msgstr "Editar metadatos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
-msgid "E"
-msgstr "E"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
-msgid "Merge book records"
-msgstr "Unir registros de libros"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
-msgid "M"
-msgstr "M"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
-msgid "Send to device"
-msgstr "Enviar al dispositivo"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
-msgid "S"
-msgstr "S"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
-msgid "Fetch news"
-msgstr "Descargar noticias (RSS)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
-msgid "F"
-msgstr "F"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
-msgid "Convert E-books"
-msgstr "Convertir libros electrónicos"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
-msgid "C"
-msgstr "C"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
-msgid "V"
-msgstr "V"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
-msgid "Open containing folder"
-msgstr "Abrir la carpeta que lo contiene"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
-msgid "Show book details"
-msgstr "Mostrar detalles del libro"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
-msgid "Books by same author"
-msgstr "Libros del mismo autor"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
-msgid "Books in this series"
-msgstr "Libros de la misma serie"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
-msgid "Books by this publisher"
-msgstr "Libros de la misma editorial"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
-msgid "Books with the same tags"
-msgstr "Libros con las mismas etiquetas"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:175
 msgid "Configure calibre"
 msgstr "Configurar calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
-msgid "Ctrl+P"
-msgstr "Ctrl+P"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:20
 msgid ""
 "Redirect console output to a dialog window (both stdout and stderr). Useful "
@@ -8263,33 +8458,43 @@ msgstr "El libro no tiene ni título ni ISBN"
 msgid "No matches found for this book"
 msgstr "No se ha encontrado el libro"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:91
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:553
 msgid "Search"
 msgstr "Buscar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:313
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:315
 msgid "The selected search will be <b>permanently deleted</b>. Are you sure?"
 msgstr ""
 "La búsqueda seleccionada será <b>borrada permanentemente</b>. ¿Está seguro?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:357
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr "Buscar (Para búsqueda avanzada, pulse el botón de la izquierda)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:392
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:398
 msgid "Saved Searches"
 msgstr "Búsquedas guardadas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:406
+msgid "Choose saved search or enter name for new saved search"
+msgstr ""
+"Elija una búsqueda guardada o asigne un nombre para guardar la nueva búsqueda"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:10
+msgid "Restrict to"
+msgstr "Restringir a"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:48
 msgid "({0} of {1})"
 msgstr "({0} de {1})"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
 msgid "(all books)"
 msgstr "(todos los libros)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:56
 msgid "({0} of all)"
 msgstr "({0} de todos)"
 
@@ -8412,18 +8617,31 @@ msgstr "Ordenar por popularidad"
 msgid "Sort by average rating"
 msgstr "Ordenar por calificación promedio"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:775
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:772
+msgid "Set the sort order for entries in the Tag Browser"
+msgstr "Establece el orden de las entradas en el navegador de etiquetas"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:778
 msgid "Match all"
 msgstr "Buscar todas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:775
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:778
 msgid "Match any"
 msgstr "Buscar cualquiera"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:783
+msgid ""
+"When selecting multiple entries in the Tag Browser match any or all of them"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:787
 msgid "Manage &user categories"
 msgstr "Administrar categorías de &usuario"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:790
+msgid "Add your own categories to the Tag Browser"
+msgstr "Añada sus propias categorías al navegador de etiquetas"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182
 msgid "Convert book %d of %d (%s)"
@@ -8451,15 +8669,15 @@ msgstr "Poniendo libros en cola para conversión en bloque"
 msgid "Queueing "
 msgstr "Poniendo en cola "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:239
 msgid "Fetch news from "
 msgstr "Obtener noticias de "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:301
 msgid "Convert existing"
 msgstr "La conversión ya existe"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:302
 msgid ""
 "The following books have already been converted to %s format. Do you wish to "
 "reconvert them?"
@@ -8475,54 +8693,46 @@ msgstr "&Restaurar"
 msgid "&Donate to support calibre"
 msgstr "&Donar para apoyar a calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:168
 msgid "&Eject connected device"
 msgstr "&Desconectar dispositivo conectado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:173
 msgid "&Restart"
 msgstr "&Reiniciar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:206
-msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
-msgstr "<p>Para ayuda mirar el: <a href=\"%s\">Manual de usuario</a><br>"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:212
-msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
-msgstr "<b>%s</b>: %s por <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:227
 msgid "Calibre Quick Start Guide"
 msgstr "Guía de inicio rápido de calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:389
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:380
 msgid "Cannot configure"
 msgstr "No se puede configurar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:376
 msgid "Cannot configure while there are running jobs."
 msgstr "No se puede configurar mientras haya tareas en ejecución."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:381
 msgid "Cannot configure before calibre is restarted."
 msgstr "No se puede configurar antes de reiniciar calibre."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:424
 msgid "No detailed info available"
 msgstr "No hay información detallada disponible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:425
 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/ui.py:486
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr "Error de conversión"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:487
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:478
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using third party tools."
@@ -8531,28 +8741,29 @@ msgstr ""
 "href=\"%s\">DRM</a>. Debe eliminar primero el DRM con herramientas de "
 "terceros."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:491
 msgid "Recipe Disabled"
 msgstr "Receta deshabilitada"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:506
 msgid "<b>Failed</b>"
 msgstr "<b>Fallo</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:546
 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."
+"you find it useful, please consider donating to support its development. "
+"Your donation helps keep calibre development going."
 msgstr ""
 "es el resultado de los esfuerzos de muchos voluntarios por todo el mundo. Si "
-"lo encuentra útil, por favor, considere donar dinero para apoyar su "
-"desarrollo."
+"lo encuentra útil, considere donar para apoyar su desarrollo. Su donación es "
+"lo que hace que el desarrollo de calibre continúe."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:572
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr "Hay tareas activas. ¿Está seguro de que quiere salir?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:575
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
@@ -8563,11 +8774,11 @@ msgstr ""
 "de datos en el dispositivo.<br>\n"
 "                      ¿Está seguro de que desea salir?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:579
 msgid "WARNING: Active jobs"
 msgstr "AVISO: Tareas activas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:640
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:632
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -8575,19 +8786,11 @@ msgstr ""
 "continuará ejecutándose en la bandeja del sistema. Para cerrarlo, elija "
 "<b>Salir</b> en el menú de contexto de la bandeja del sistema."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/update.py:52
-msgid ""
-"<span style=\"color:red; font-weight:bold\">Latest version: <a "
-"href=\"%s\">%s</a></span>"
-msgstr ""
-"<span style=\"color:red; font-weight:bold\">Última versión: <a "
-"href=\"%s\">%s</a></span>"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/update.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:56
 msgid "Update available"
 msgstr "Actualización disponible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/update.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:57
 msgid ""
 "%s has been updated to version %s. See the <a href=\"http://calibre-"
 "ebook.com/whats-new\">new features</a>. Visit the download page?"
@@ -9071,103 +9274,43 @@ msgstr "Mayús+F3"
 msgid "Print eBook"
 msgstr "Imprimir libro electrónico"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
 msgid "Copy Image"
 msgstr "Copiar imagen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:240
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:239
 msgid "Paste Image"
 msgstr "Pegar imagen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:270
-msgid ""
-"Library\n"
-"%d\n"
-"books"
-msgstr ""
-"Biblioteca\n"
-"%d\n"
-"libros"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:271
-msgid ""
-"Reader\n"
-"%s\n"
-"available"
-msgstr ""
-"Lector\n"
-"%s\n"
-"disponible"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:272
-msgid ""
-"Card A\n"
-"%s\n"
-"available"
-msgstr ""
-"Tarjeta A\n"
-"%s\n"
-"disponible"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:273
-msgid ""
-"Card B\n"
-"%s\n"
-"available"
-msgstr ""
-"Tarjeta B\n"
-"%s\n"
-"disponible"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:277
-msgid "Click to see the books available on your computer"
-msgstr "Pulsar para ver los libros disponibles en el equipo"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:280
-msgid "Click to see the books in the main memory of your reader"
-msgstr "Pulsar para ver los libros en la memoria principal del lector"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:281
-msgid "Click to see the books on storage card A in your reader"
-msgstr "Pulsar para ver los libros en la tarjeta de memoria A del lector"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:282
-msgid "Click to see the books on storage card B in your reader"
-msgstr "Pulsar para ver los libros en la tarjeta de memoria B del lector"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:290
-msgid "Books located at"
-msgstr "Libros ubicados en"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:364
 msgid "Change Case"
 msgstr "Cambiar mayúsculas/minúsculas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:365
 msgid "Upper Case"
 msgstr "Mayúsculas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:366
 msgid "Lower Case"
 msgstr "Minúsculas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:367
 msgid "Swap Case"
 msgstr "Invertir mayúsculas/minúsculas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:368
 msgid "Title Case"
 msgstr "Formato de título (todas las iniciales en mayúscula)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:974
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:837
 msgid "Drag to resize"
 msgstr "Arrastre para ajustar el tamaño"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:869
 msgid "Show"
 msgstr "Mostrar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1012
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:876
 msgid "Hide"
 msgstr "Ocultar"
 
@@ -10546,10 +10689,8 @@ msgid "User-created tag browser categories"
 msgstr "Categorías del explorador de etiquetas creadas por el usuario"
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:702
-msgid "Preserve all collections even if not in library metadata."
-msgstr ""
-"Mantener todas las colecciones aunque no estén en los metadatos de la "
-"biblioteca."
+msgid "How and when calibre updates metadata on the device."
+msgstr "Cómo y cuándo actualiza calibre los metadatos del dispositivo."
 
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:43
 msgid "Waiting..."
@@ -10723,84 +10864,84 @@ msgstr "Fuente de noticias desconocida"
 msgid "The \"%s\" recipe needs a username and password."
 msgstr "La receta \"%s\" necesita usuario y contraseña."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:706
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:708
 msgid "Download finished"
 msgstr "Descarga finalizada"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:708
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:710
 msgid "Failed to download the following articles:"
 msgstr "Fallo al descargar los siguientes artículos:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:714
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:716
 msgid "Failed to download parts of the following articles:"
 msgstr "Fallo al descargar partes de los siguientes artículos"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:716
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:718
 msgid " from "
 msgstr " de "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:718
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:720
 msgid "\tFailed links:"
 msgstr "\tEnlaces fallidos:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:807
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:809
 msgid "Could not fetch article. Run with -vv to see the reason"
 msgstr ""
 "No se pudo obtener el artículo. Ejecute calibre con -vv para ver el motivo"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:828
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:830
 msgid "Fetching feeds..."
 msgstr "Obteniendo canales de noticias..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:833
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:835
 msgid "Got feeds from index page"
 msgstr "Se obtivieron canales de noticias de la página principal"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:839
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:841
 msgid "Trying to download cover..."
 msgstr "Intentando descargar la portada..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:841
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Generating masthead..."
 msgstr "Generando el rótulo:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:922
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:924
 msgid "Starting download [%d thread(s)]..."
 msgstr "Iniciando la descarga [%d proceso(s)]"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:938
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:940
 msgid "Feeds downloaded to %s"
 msgstr "Canales de noticias descargados en %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:948
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:950
 msgid "Could not download cover: %s"
 msgstr "No se pudo descargar la portada: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:960
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
 msgid "Downloading cover from %s"
 msgstr "Descargando la portada desde %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1002
 msgid "Masthead image downloaded"
 msgstr "Imagen del rótulo descargada"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1190
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1192
 msgid "Untitled Article"
 msgstr "Artículo sin título"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1261
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1263
 msgid "Article downloaded: %s"
 msgstr "Artículo descargado: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1272
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1274
 msgid "Article download failed: %s"
 msgstr "Falló la descarga del artículo: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1289
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1291
 msgid "Fetching feed"
 msgstr "Obteniendo canal de noticias"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1436
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1438
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
@@ -10808,7 +10949,7 @@ msgstr ""
 "No se pudo ingresar, revise su nombre de usuario o clave para el servicio de "
 "boletín de calibre"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1452
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1454
 msgid ""
 "You do not have permission to download this issue. Either your subscription "
 "has expired or you have exceeded the maximum allowed downloads for today."
@@ -11415,6 +11556,13 @@ msgstr "No descargar estilos CSS."
 #~ "<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"
 
+#~ msgid ""
+#~ "<span style=\"color:red; font-weight:bold\">Latest version: <a "
+#~ "href=\"%s\">%s</a></span>"
+#~ msgstr ""
+#~ "<span style=\"color:red; font-weight:bold\">Última versión: <a "
+#~ "href=\"%s\">%s</a></span>"
+
 #~ 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"
 
@@ -11936,6 +12084,24 @@ msgstr "No descargar estilos CSS."
 #~ "%s\n"
 #~ "disponible"
 
+#~ msgid ""
+#~ "Reader\n"
+#~ "%s\n"
+#~ "available"
+#~ msgstr ""
+#~ "Lector\n"
+#~ "%s\n"
+#~ "disponible"
+
+#~ msgid ""
+#~ "Library\n"
+#~ "%d\n"
+#~ "books"
+#~ msgstr ""
+#~ "Biblioteca\n"
+#~ "%d\n"
+#~ "libros"
+
 #~ msgid "<p>Copying books to %s<br><center>"
 #~ msgstr "<p>Copiando libros a %s<br><center>"
 
@@ -12828,6 +12994,9 @@ msgstr "No descargar estilos CSS."
 #~ "<p>Para más ayuda, visite <a "
 #~ "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
 
+#~ msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
+#~ msgstr "<b>%s</b>: %s por <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
+
 #~ msgid "Choose a location for your ebook library."
 #~ msgstr "Elija otra ubicación para la biblioteca de libros electrónicos."
 
@@ -12870,6 +13039,14 @@ msgstr "No descargar estilos CSS."
 #~ msgid "Invalid library location"
 #~ msgstr "Ubicación de la biblioteca no válida"
 
+#~ 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 ""
+#~ "es el resultado de los esfuerzos de muchos voluntarios por todo el mundo. Si "
+#~ "lo encuentra útil, por favor, considere donar dinero para apoyar su "
+#~ "desarrollo."
+
 #~ msgid ""
 #~ "%s has been updated to version %s. See the <a "
 #~ "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">new features</a>. "
@@ -12879,6 +13056,9 @@ msgstr "No descargar estilos CSS."
 #~ "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">nuevas "
 #~ "características</a>. ¿Visitar la página de descarga?"
 
+#~ msgid "Convert E-books"
+#~ msgstr "Convertir libros electrónicos"
+
 #~ msgid "Click to turn off Cover Browsing"
 #~ msgstr "Pulse para desactivar la exploración de portadas"
 
@@ -12901,6 +13081,24 @@ msgstr "No descargar estilos CSS."
 #~ msgid "Ebook Viewer"
 #~ msgstr "Visor de libros electrónicos"
 
+#~ msgid ""
+#~ "Card A\n"
+#~ "%s\n"
+#~ "available"
+#~ msgstr ""
+#~ "Tarjeta A\n"
+#~ "%s\n"
+#~ "disponible"
+
+#~ msgid ""
+#~ "Card B\n"
+#~ "%s\n"
+#~ "available"
+#~ msgstr ""
+#~ "Tarjeta B\n"
+#~ "%s\n"
+#~ "disponible"
+
 #~ msgid ""
 #~ "<h2>Demo videos</h2>Videos demonstrating the various features of calibre are "
 #~ "available <a "
@@ -13065,6 +13263,9 @@ msgstr "No descargar estilos CSS."
 #~ msgid "This profile is intended for the Hanlin V3/V5 and its clones."
 #~ msgstr "Este perfil está pensado para el Hanlin V3/V5 y sus clones."
 
+#~ msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
+#~ msgstr "<p>Para ayuda mirar el: <a href=\"%s\">Manual de usuario</a><br>"
+
 #~ msgid "Communicate with the Sony PRS-300/505/500 eBook reader."
 #~ msgstr "Comunicar con el lector Sony PRS-300/505/500"
 
@@ -13226,3 +13427,27 @@ msgstr "No descargar estilos CSS."
 
 #~ msgid "The name %s is already used."
 #~ msgstr "El nombre %s ya está en uso."
+
+#~ msgid "  "
+#~ msgstr "  "
+
+#~ msgid "Preserve device collections."
+#~ msgstr "Mantiene las colecciones del dispositivo"
+
+#~ msgid ""
+#~ "If checked, collections will not be deleted even if a book with changed "
+#~ "metadata is resent and the collection is not in the book's metadata. In "
+#~ "addition, editing collections in the device view will be enabled. If "
+#~ "unchecked, collections will be always reflect only the metadata in the "
+#~ "calibre library."
+#~ msgstr ""
+#~ "Si se activa, las colecciones no se borrarán incluso si un libro con los "
+#~ "metadatos modificados se vuelve a enviar y la colección no está en los "
+#~ "metadatos del libro. Además, se hace posible editar las colecciones en la "
+#~ "vista del dispositivo. Si se desactiva, las colecciones corresponderán "
+#~ "siempre a los metadatos en la biblioteca de calibre."
+
+#~ msgid "Preserve all collections even if not in library metadata."
+#~ msgstr ""
+#~ "Mantener todas las colecciones aunque no estén en los metadatos de la "
+#~ "biblioteca."
diff --git a/src/calibre/translations/fi.po b/src/calibre/translations/fi.po
index ccbaeec292..9d0652c269 100644
--- a/src/calibre/translations/fi.po
+++ b/src/calibre/translations/fi.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-07-03 01:21+0000\n"
-"PO-Revision-Date: 2010-07-02 08:48+0000\n"
-"Last-Translator: Jeespox <Unknown>\n"
+"POT-Creation-Date: 2010-07-09 22:00+0000\n"
+"PO-Revision-Date: 2010-07-09 20:16+0000\n"
+"Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Finnish <fi@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: 2010-07-03 03:44+0000\n"
+"X-Launchpad-Export-Date: 2010-07-10 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
@@ -27,10 +27,10 @@ msgstr "Ei tee mitään"
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:71
 #: /home/kovid/work/calibre/src/calibre/devices/prs500/books.py:267
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:466
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:492
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:396
-#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:98
-#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:101
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:97
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:100
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/metadata.py:56
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:428
 #: /home/kovid/work/calibre/src/calibre/ebooks/fb2/input.py:67
@@ -72,9 +72,9 @@ msgstr "Ei tee mitään"
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:818
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:49
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:51
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:910
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:915
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:981
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:911
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:916
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:982
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:137
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:139
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:108
@@ -102,20 +102,20 @@ msgstr "Ei tee mitään"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:233
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:290
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:815
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:818
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:814
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:817
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:172
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:179
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:22
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:135
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:903
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:912
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1192
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1195
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:898
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:907
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1190
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1193
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:120
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:155
@@ -123,8 +123,8 @@ msgstr "Ei tee mitään"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:172
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:362
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:877
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1054
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:882
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1060
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:87
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:92
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:185
@@ -170,7 +170,7 @@ msgstr "Metatietojen kirjoittaja"
 msgid "Catalog generator"
 msgstr "Katalogin luoja"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:15
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:16
 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 "
@@ -180,7 +180,7 @@ msgstr ""
 "kaikki linkitetyt tiedostot. Tämä lisäosa ajetaan aina lisätessäsi HTML-"
 "tiedoston kirjastoon."
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:51
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:52
 msgid ""
 "Character encoding for the input HTML files. Common choices include: cp1252, "
 "latin1, iso-8859-1 and utf-8."
@@ -188,7 +188,7 @@ msgstr ""
 "HTML-tiedostojen merkkikoodaus. Yleisiä vaihtoehtoja: cp1252, latin1, iso-"
 "8859-1 ja utf-8."
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:58
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:59
 msgid ""
 "Create a PMLZ archive containing the PML file and all images in the "
 "directory pmlname_img or images. This plugin is run every time you add a PML "
@@ -198,49 +198,49 @@ msgstr ""
 "pmlname_img tai images. Tämä lisäosa ajetaan aina lisätessäsi PML-tiedoston "
 "kirjastoon."
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:90
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:93
 msgid "Extract cover from comic files"
 msgstr "Poimi kansi sarjakuvatiedostosta"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:117
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:128
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:140
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:150
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:160
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:171
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:181
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:191
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:201
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:211
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:221
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:232
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:243
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:255
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:276
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:287
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:297
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:307
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:120
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:131
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:153
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:163
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:174
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:184
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:194
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:204
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:214
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:224
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:235
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:246
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:258
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:279
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:290
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:300
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:310
 msgid "Read metadata from %s files"
 msgstr "Lue metatiedot %s -tiedostoista"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:266
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:269
 msgid "Read metadata from ebooks in RAR archives"
 msgstr "Lue metatiedot RAR-arkiston e-kirjoista"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:318
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:321
 msgid "Read metadata from ebooks in ZIP archives"
 msgstr "Lue metatiedot ZIP-arkiston e-kirjoista"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:331
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:341
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:351
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:373
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:384
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:394
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:334
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:344
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:354
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:376
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:387
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:397
 msgid "Set metadata in %s files"
 msgstr "Aseta metatiedot %s -tiedostoille"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:362
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:365
 msgid "Set metadata from %s files"
 msgstr "Aseta metatiedot %s -tiedostoista"
 
@@ -403,35 +403,35 @@ msgstr ""
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr "Tämä profiili on tarkoitettu Amazon Kindle DX -laitteelle."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:31
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
 msgid "Installed plugins"
 msgstr "Asennetut lisäosat"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:33
 msgid "Mapping for filetype plugins"
 msgstr "Tiedostotyyppien lisäosan kuvaus"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:33
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:34
 msgid "Local plugin customization"
 msgstr "Paikallisten lisäosien säätö"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:34
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
 msgid "Disabled plugins"
 msgstr "Käytöstä poistetut lisäosat"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
 msgid "Enabled plugins"
 msgstr "Käytössä olevat pluginit"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:83
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:84
 msgid "No valid plugin found in "
 msgstr "Sopivaa lisäosaa ei löydetty "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:460
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:468
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr "%s lisäosan alustaminen epäonnistui:"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:493
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
 msgid ""
 "    %prog options\n"
 "\n"
@@ -443,17 +443,17 @@ msgstr ""
 "    Säädä calibrea lataamalla ulkoisia lisäosia.\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:499
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr "Lisää lisäosa määrittämällä sen sisältävän zip-tiedoston polku."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 "Poista valinnainen lisäosa nimen perusteella. Ei vaikuta "
 "sisäänrakennettuihin lisäosiin"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:503
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:511
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
@@ -461,15 +461,15 @@ msgstr ""
 "Säädä lisäosaa. Määritä lisäosan nimi ja säädöksen käskyjono pilkulla "
 "erotettuna."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:505
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:513
 msgid "List all installed plugins"
 msgstr "Listaa kaikki asennetut lisäosat"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Enable the named plugin"
 msgstr "Salli nimetty lisäosa"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Disable the named plugin"
 msgstr "Poista nimetty lisäosa käytöstä"
 
@@ -627,7 +627,7 @@ msgstr "Kommunikoi Hanlin V5 -lukijoiden kanssa."
 msgid "Communicate with the BOOX eBook reader."
 msgstr "Kommunikoi BOOX-lukijan kanssa."
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:121
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:123
 msgid ""
 "Comma separated list of directories to send e-books to on the device. The "
 "first one that exists will be used."
@@ -700,7 +700,7 @@ msgstr "Kommunikoi Kobo Readerin kanssa"
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:51
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:54
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:57
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:157
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:159
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:64
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:67
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:70
@@ -710,22 +710,22 @@ msgstr "Kommunikoi Kobo Readerin kanssa"
 msgid "Getting list of books on device..."
 msgstr "Haetaan listaa laitteella olevista kirjoista..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:218
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:258
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:219
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:263
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:244
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:262
 msgid "Removing books from device..."
 msgstr "Poistetaan kirjoja laitteelta..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:262
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:269
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:267
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:274
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:269
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:274
 msgid "Removing books from device metadata listing..."
 msgstr "Poistetaan kirjoja laitteen metatietolistasta..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:274
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:308
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:313
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:208
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:238
 msgid "Adding books to device metadata listing..."
@@ -743,6 +743,10 @@ msgstr "Kommunikoi Booq Avantin kanssa"
 msgid "Communicate with the Sweex MM300"
 msgstr "Kommunikoi Sweex MM300:n kanssa"
 
+#: /home/kovid/work/calibre/src/calibre/devices/misc.py:75
+msgid "Communicate with the Pandigital Novel"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:17
 msgid "Communicate with the Nokia 770 internet tablet."
 msgstr "Kommunikoi Nokia 770 internet tablet -laitteen kanssa."
@@ -1561,6 +1565,51 @@ msgstr ""
 msgid "Creating"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/__init__.py:18
+msgid "ePub Fixer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/epubcheck.py:18
+msgid "Workaround epubcheck bugs"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/epubcheck.py:22
+msgid ""
+"Workarounds for bugs in the latest release of epubcheck. epubcheck reports "
+"many things as errors that are not actually errors. %prog will try to detect "
+"these and replace them with constructs that epubcheck likes. This may cause "
+"significant changes to your epub, complain to the epubcheck project."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:19
+msgid ""
+"%prog [options] file.epub\n"
+"\n"
+"Fix common problems in EPUB files that can cause them to be rejected by "
+"poorly designed publishing services.\n"
+"\n"
+"By default, no fixing is done and messages are printed out for each error "
+"detected. Use the options to control which errors are automatically fixed."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:50
+msgid "You must specify an epub file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:17
+msgid "Fix unmanifested files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:21
+msgid ""
+"Fix unmanifested files. %prog can either add them to the manifest or delete "
+"them as specified by the delete unmanifested option."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:32
+msgid "Delete unmanifested files instead of adding them to the manifest"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:56
 msgid ""
 "Extract the contents of the generated EPUB file to the specified directory. "
@@ -1869,11 +1918,11 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:98
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:882
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:887
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:543
 msgid "Title"
 msgstr ""
@@ -1882,7 +1931,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:364
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:883
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:888
 msgid "Author(s)"
 msgstr ""
 
@@ -1905,7 +1954,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:67
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:318
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1073
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1079
 msgid "Comments"
 msgstr ""
 
@@ -1914,7 +1963,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:306
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1069
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1075
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:139
 msgid "Tags"
 msgstr ""
@@ -1924,7 +1973,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:323
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1084
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:87
 msgid "Series"
 msgstr ""
@@ -1934,7 +1983,7 @@ msgid "Language"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:406
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1067
 msgid "Timestamp"
 msgstr ""
 
@@ -2159,7 +2208,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1226
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1398
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1399
 msgid "Cover"
 msgstr ""
 
@@ -2198,70 +2247,70 @@ msgstr ""
 msgid "This is an Amazon Topaz book. It cannot be processed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1399
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1400
 msgid "Title Page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1400
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1401
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:15
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:53
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:194
 msgid "Table of Contents"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1401
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1402
 msgid "Index"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1402
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1403
 msgid "Glossary"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1403
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1404
 msgid "Acknowledgements"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1404
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1405
 msgid "Bibliography"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1405
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1406
 msgid "Colophon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1406
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1407
 msgid "Copyright"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1407
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1408
 msgid "Dedication"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1408
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1409
 msgid "Epigraph"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1409
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1410
 msgid "Foreword"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1410
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1411
 msgid "List of Illustrations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1411
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1412
 msgid "List of Tables"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1412
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1413
 msgid "Notes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1413
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1414
 msgid "Preface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1414
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1415
 msgid "Main Text"
 msgstr ""
 
@@ -2305,7 +2354,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:22
 #: /home/kovid/work/calibre/src/calibre/ebooks/tcr/input.py:23
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:23
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:24
 msgid ""
 "Normally calibre treats blank lines as paragraph markers. With this option "
 "it will assume that every line represents a paragraph instead."
@@ -2313,7 +2362,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:26
 #: /home/kovid/work/calibre/src/calibre/ebooks/tcr/input.py:27
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:27
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:28
 msgid ""
 "Normally calibre treats blank lines as paragraph markers. With this option "
 "it will assume that every line starting with an indent (either a tab or 2+ "
@@ -2442,7 +2491,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
 msgid "Author"
 msgstr ""
@@ -2577,19 +2626,19 @@ msgid ""
 "slowest."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:33
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:34
 msgid ""
 "Normally extra spaces are condensed into a single space. With this option "
 "all spaces will be displayed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:36
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:37
 msgid ""
 "Run the text input through the markdown pre-processor. To learn more about "
 "markdown see"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:39
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:40
 msgid "Do not insert a Table of Contents into the output text."
 msgstr ""
 
@@ -2751,7 +2800,7 @@ msgstr ""
 msgid "Copy to Clipboard"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:400
 msgid "Choose Files"
 msgstr ""
 
@@ -2766,13 +2815,13 @@ msgid "User annotations generated from main library only"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:75
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:612
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:671
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:708
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:729
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:877
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1060
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:670
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:707
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:728
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:876
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:941
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1059
 msgid "No books selected"
 msgstr ""
 
@@ -2812,209 +2861,209 @@ msgstr ""
 msgid "How many empty books should be added?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:340
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:390
 msgid "Uploading books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:350
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:137
 msgid "Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
 msgid "EPUB Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
 msgid "LRF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
 msgid "HTML Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
 msgid "LIT Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
 msgid "MOBI Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
 msgid "Topaz books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
 msgid "Text books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:359
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
 msgid "PDF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:359
 msgid "Comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:360
 msgid "Archives"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:364
 msgid "Supported books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:399
 msgid "Merged some books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:401
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:400
 msgid ""
 "Some duplicates were found and merged into the following existing books:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:409
 msgid "Failed to read metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:410
 msgid "Failed to read metadata from the following"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:434
 msgid "Add to library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:460
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1229
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:459
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1228
 msgid "No book selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:434
 msgid "No book files found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:456
 msgid "Cannot delete"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:469
 msgid "Choose formats to be deleted"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:488
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:487
 msgid "Choose formats <b>not</b> to be deleted"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:507
 msgid "Cannot delete books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:509
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:508
 msgid "No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:519
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:518
 msgid "Main memory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:519
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:444
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:453
 msgid "Storage Card A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:521
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:520
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:446
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:455
 msgid "Storage Card B"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:525
 msgid "No books to delete"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:526
 msgid "None of the selected books are on the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:544
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:600
 msgid "Deleting books from device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:564
 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/actions.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:585
 msgid ""
 "The selected books will be <b>permanently deleted</b> from your device. Are "
 "you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:610
 msgid "Cannot download metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:627
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
 msgid "social metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
 msgid "covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
 msgid "metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:630
 msgid "Downloading %s for %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:654
 msgid "Failed to download some metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:656
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
 msgid "Failed to download metadata for the following:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:659
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:658
 msgid "Failed to download metadata:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:660
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:659
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:637
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:522
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:949
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:951
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
 msgid "Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:670
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:707
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:669
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:706
 msgid "Cannot edit metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:728
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:731
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:727
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:730
 msgid "Cannot merge books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:732
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:731
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:736
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:735
 msgid ""
 "All book formats and metadata from the selected books will be added to the "
 "<b>first selected book.</b><br><br> The second and subsequently selected "
@@ -3022,7 +3071,7 @@ msgid ""
 "proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:747
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:746
 msgid ""
 "All book formats and metadata from the selected books will be merged into "
 "the <b>first selected book</b>.<br><br>After merger the second and "
@@ -3032,99 +3081,99 @@ msgid ""
 "from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:759
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:758
 msgid ""
 "You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
 "proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:876
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:875
 msgid "Cannot save to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:878
 msgid "Choose destination directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:912
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:911
 msgid "Error while saving"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:913
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:912
 msgid "There was an error while saving."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:919
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:920
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:921
 msgid "Could not save some books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:922
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:921
 msgid "Click the show details button to see which ones."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
 msgid "No books selected to generate catalog for"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:960
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:959
 msgid "Generating %s catalog..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:965
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:964
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:264
 msgid "No books found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:966
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:965
 msgid ""
 "No books to catalog\n"
 "Check exclude tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:976
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:975
 msgid "Catalog generated."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:979
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:978
 msgid "Export Catalog Directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:980
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:979
 msgid "Select destination for %s.%s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:996
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:995
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1009
 msgid " fetched."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1059
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1058
 msgid "Cannot convert"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1088
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1087
 msgid "Starting conversion of %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1265
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1264
 msgid "Cannot view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1209
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
 msgid "Choose the format to view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1218
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1217
 msgid "Multiple Books Selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1219
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1218
 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 "
@@ -3132,11 +3181,11 @@ msgid ""
 "continue?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1227
 msgid "Cannot open folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1266
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1265
 msgid "%s has no available formats."
 msgstr ""
 
@@ -3161,7 +3210,7 @@ msgid "The specified directory could not be processed."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:845
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:840
 msgid "No books"
 msgstr ""
 
@@ -3285,15 +3334,15 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:52
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:633
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:637
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:366
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:371
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:385
@@ -3317,12 +3366,12 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:265
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:186
@@ -3352,8 +3401,9 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:313
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1059
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1065
 msgid "Path"
 msgstr ""
 
@@ -3370,8 +3420,8 @@ msgid "Formats"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:25
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:886
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1062
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:891
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1068
 msgid "Collections"
 msgstr ""
 
@@ -3384,12 +3434,12 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:305
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:311
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:317
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1068
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1072
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1074
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:458
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:467
 msgid "None"
 msgstr ""
 
@@ -4448,11 +4498,11 @@ msgid ""
 "href=\"http://calibre-ebook.com/user_manual/xpath.html\">XPath Tutorial</a>."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:127
 msgid "Cover browser could not be loaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:179
 msgid "Browse by covers"
 msgstr ""
 
@@ -4642,128 +4692,124 @@ msgstr ""
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:778
-msgid "Connected "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:846
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:851
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:846
 msgid "Choose format to send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:860
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:855
 msgid "No device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:856
 msgid "Cannot send: No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:868
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:859
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:863
 msgid "No card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:869
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:860
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:910
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:905
 msgid "E-book:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:913
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:908
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:909
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:181
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:915
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:910
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:928
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:923
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:958
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:965
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1057
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1118
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1236
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:953
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:961
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1053
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1115
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1234
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1242
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:959
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:954
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:966
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:962
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:984
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:980
 msgid "Failed to email books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:985
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:981
 msgid "Failed to email the following books:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:989
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:985
 msgid "Sent by email:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1016
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1012
 msgid "News:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1017
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1013
 msgid "Attached is the"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1028
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1024
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1058
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1237
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1054
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1235
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1087
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1084
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1150
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1148
 msgid "Sending news to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1201
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1244
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1243
 msgid ""
 "Could not upload the following books to the device, as no suitable formats "
 "were found. Convert the book(s) to a format supported by your device first."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1305
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1304
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1306
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1305
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -4801,7 +4847,7 @@ msgid "My Books"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:69
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:289
 msgid "Generate catalog"
 msgstr ""
 
@@ -4934,157 +4980,157 @@ msgstr ""
 msgid "Narrow"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:503
 msgid "System port selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:503
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:504
 msgid ""
 "The value <b>%d</b> you have chosen for the content server port is a system "
 "port. Your operating system <b>may</b> not allow the server to run on this "
 "port. To be safe choose a port number larger than 1024."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:524
 msgid "Failed to install command line tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:527
 msgid "Command line tools installed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:528
 msgid "Command line tools installed in"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:529
 msgid ""
 "If you move calibre.app, you have to re-install the command line tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:580
 msgid "No valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:581
 msgid "%s is not a valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:584
 msgid "Choose plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:596
 msgid "Plugin cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:597
 msgid "The plugin: %s cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:606
 msgid "Plugin not customizable"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:607
 msgid "Plugin: %s does not need customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:615
 msgid "Customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:652
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:653
 msgid "Cannot remove builtin plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:653
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:654
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:684
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:685
 msgid "You must select a column to delete it"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:690
 msgid "The selected column is not a custom column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:690
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:691
 #: /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/config/__init__.py:691
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:692
 msgid "Do you really want to delete column %s and all its data?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:758
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:759
 msgid "Error log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:765
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:766
 msgid "Access log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:793
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:794
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:332
 msgid "Failed to start content server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:817
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:818
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:587
 msgid "Select location for books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:824
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:825
 msgid "Invalid size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:825
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:826
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:884
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:889
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:891
 msgid "Invalid database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:885
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:887
 msgid "Invalid database location "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:888
 msgid "<br>Must be a directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:890
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:892
 msgid "Invalid database location.<br>Cannot write to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:895
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:897
 msgid "Must restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:896
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:898
 msgid ""
 "The changes you made require that Calibre be restarted. Please restart as "
 "soon as practical."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:930
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:932
 msgid "Checking database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:950
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:952
 msgid "Failed to check database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:957
 msgid "Some inconsistencies found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:956
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:958
 msgid ""
 "The following books had formats listed in the database that are not actually "
 "available. The entries for the formats have been removed. You should check "
@@ -5199,7 +5245,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:137
 msgid "  "
-msgstr ""
+msgstr "  "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:138
 msgid ""
@@ -5212,296 +5258,300 @@ msgstr ""
 msgid "Sending to &device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:167
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
 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/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
 msgid "Browse for the new database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
 msgid "Show notification when &new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
 msgid "Download &social metadata (tags/ratings/etc.) by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
 msgid "&Overwrite author and title by default when fetching metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
 msgid "Default network &timeout:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
 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/config_ui.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
 msgid " seconds"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
 msgid "Normal"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
 msgid "High"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
 msgid "Low"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
 msgid "Job &priority:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
 msgid "Preferred &output format:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
 msgid "Preferred &input format order:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
 msgid "Use &Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
 msgid "Show &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
 msgid "Show &average ratings in the tags browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
 msgid "Search as you type"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
 msgid "&Delete news from library when it is automatically sent to reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
 msgid "Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
 msgid "Small"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
 msgid "&Button size in toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
 msgid "Show &text in toolbar buttons"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
 msgid "Select visible &columns in library view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
 msgid "Remove a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
 msgid "Add a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
 msgid "Edit settings of a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
 msgid "Use internal &viewer for:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
 msgid "User Interface &layout (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
 msgid "Disable &animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
-msgid "Add an email address to which to send books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
-msgid "&Add email"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
-msgid "Make &default"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
-msgid "&Remove email"
+msgid "Show &donate button (restart)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
+msgid "Add an email address to which to send books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
+msgid "&Add email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
+msgid "Make &default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
+msgid "&Remove email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
 msgid ""
 "calibre can send your books to you (or your reader) by email. Emails will be "
 "automatically sent for downloaded news to all email addresses that have Auto-"
 "send checked."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
 msgid "&Maximum number of waiting worker processes (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
 msgid "&Check database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
 msgid "&Install command line tools"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
 msgid "Open calibre &configuration directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
 msgid "Limit the max. simultaneous jobs to the available CPU &cores"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
 msgid "Debug &device detection"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
 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/config_ui.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
 msgid "Server &port:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:212
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:117
 msgid "&Username:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:213
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:119
 msgid "&Password:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
 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/config_ui.py:615
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
 msgid "Max. &cover size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:621
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:214
 msgid "&Show password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
 msgid "Max. &OPDS items per query:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
 msgid "Max. OPDS &ungrouped items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
 msgid "&Start Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:621
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
 msgid "St&op Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:626
 msgid "&Test Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
 msgid "Run server &automatically on startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:628
 msgid "View &server logs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:46
 msgid ""
 "<p>Remember to leave calibre running as the server only runs as long as "
@@ -5512,33 +5562,33 @@ msgid ""
 "the IP address of the computer calibre is running on."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:631
 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/config_ui.py:628
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:632
 msgid "Enable/&Disable plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:633
 msgid "&Customize plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:630
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:634
 msgid "&Remove plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:635
 msgid "Add new plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:632
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:636
 msgid "Plugin &file:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:634
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:638
 msgid "&Add"
 msgstr ""
 
@@ -5576,9 +5626,9 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:31
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:884
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:889
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Date"
 msgstr ""
@@ -5770,12 +5820,18 @@ msgstr ""
 msgid "ERROR"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:67
+msgid ""
+"All checked books will be <b>permanently deleted</b> from your device. "
+"Please verify the list."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 msgid "Location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1058
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1064
 msgid "Format"
 msgstr ""
 
@@ -6573,6 +6629,10 @@ msgstr ""
 msgid "Add tag to available tags and apply it to current book"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:20
+msgid "%s (was %s)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:501
 msgid "Item is blank"
@@ -6907,146 +6967,162 @@ msgstr ""
 msgid "Save single format to disk..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:53
 msgid "Edit metadata individually"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:56
 msgid "Edit metadata in bulk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:59
 msgid "Download metadata and covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:62
 msgid "Download only metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:64
 msgid "Download only covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:67
 msgid "Download only social metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:73
 msgid "Merge into first selected book - delete others"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:76
 msgid "Merge into first selected book - keep others"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:84
 msgid "Add books from a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:86
 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/init.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:90
 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/init.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:93
 msgid "Add Empty book. (Book entry with no formats)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:102
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
 msgid "Save to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Save to disk in a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:106
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:402
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:394
 msgid "Save only %s format to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:110
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:397
 msgid "Save only %s format to disk in a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:119
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
 msgid "View"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:121
 msgid "View specific format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:127
 msgid "Remove selected books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:129
 msgid "Remove files of a specific format from selected books.."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:132
 msgid "Remove all formats from selected books, except..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:135
 msgid "Remove covers from selected books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:138
 msgid "Remove matching books from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:155
 msgid "Convert individually"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:157
 msgid "Bulk convert"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:161
 msgid "Create catalog of books in your calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:169
 msgid "Run welcome wizard"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:205
 msgid "Similar books..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:237
 msgid "Add books to library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:234
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:241
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:253
 msgid "Manage collections"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:328
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:333
 msgid "Cover Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:351
 msgid "Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:372
+msgid "version"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:373
+msgid "created by Kovid Goyal"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:391
+msgid "Connected "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:400
+msgid "Update found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:454
 msgid "Book Details"
 msgstr ""
 
@@ -7130,29 +7206,29 @@ msgid "Rating"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:324
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1084
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:674
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1176
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1182
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:886
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:885
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:890
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1156
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1162
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1165
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr ""
 
@@ -7196,11 +7272,11 @@ msgstr ""
 msgid "Restore default layout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:524
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:525
 msgid "Not allowed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:526
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
@@ -7397,155 +7473,163 @@ msgstr ""
 msgid "try deleting the file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:247
 msgid "calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:249
 msgid "&Restrict to:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:250
 msgid ""
 "Books display will be restricted to those matching the selected saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:251
 msgid "set in ui.py"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:252
 msgid "Advanced search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
 msgid "Alt+S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
 msgid "&Search:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
 msgid ""
 "<p>Search the list of books by title, author, publisher, tags, comments, "
 "etc.<br><br>Words separated by spaces are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
 msgid "Reset Quick Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
-msgid "Choose saved search or enter name for new saved search"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
 msgid "Copy current search text (instead of search name)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
 msgid "Save current search under the name shown in the box"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
 msgid "Delete current saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
 msgid "Add books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
 msgid "A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
 msgid "Remove books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
 msgid "Del"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
 msgid "Edit meta information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
 msgid "E"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
 msgid "Merge book records"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
 msgid "M"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
 msgid "Send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
 msgid "S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
 msgid "Convert E-books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
 msgid "C"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
 msgid "V"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
 msgid "Open containing folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
 msgid "Show book details"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
 msgid "Books by same author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
 msgid "Books in this series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
 msgid "Books by this publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
 msgid "Books with the same tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
 msgid "Configure calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
 msgid "Ctrl+P"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
+msgid "Help"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
+msgid "Browse the calibre User Manual"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
+msgid "F1"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:20
 msgid ""
 "Redirect console output to a dialog window (both stdout and stderr). Useful "
@@ -7572,32 +7656,36 @@ msgstr ""
 msgid "No matches found for this book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:91
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:262
 msgid "Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:313
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:315
 msgid "The selected search will be <b>permanently deleted</b>. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:357
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:392
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:398
 msgid "Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:406
+msgid "Choose saved search or enter name for new saved search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:47
 msgid "({0} of {1})"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:53
 msgid "(all books)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:55
 msgid "({0} of all)"
 msgstr ""
 
@@ -7720,18 +7808,31 @@ msgstr ""
 msgid "Sort by average rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:775
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:772
+msgid "Set the sort order for entries in the Tag Browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:778
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:775
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:778
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:783
+msgid ""
+"When selecting multiple entries in the Tag Browser match any or all of them"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:787
 msgid "Manage &user categories"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:790
+msgid "Add your own categories to the Tag Browser"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182
 msgid "Convert book %d of %d (%s)"
@@ -7757,15 +7858,15 @@ msgstr ""
 msgid "Queueing "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:239
 msgid "Fetch news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:301
 msgid "Convert existing"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:302
 msgid ""
 "The following books have already been converted to %s format. Do you wish to "
 "reconvert them?"
@@ -7779,104 +7880,91 @@ msgstr ""
 msgid "&Donate to support calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:168
 msgid "&Eject connected device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:173
 msgid "&Restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:206
-msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:212
-msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:227
 msgid "Calibre Quick Start Guide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:389
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:381
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:377
 msgid "Cannot configure while there are running jobs."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:382
 msgid "Cannot configure before calibre is restarted."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:425
 msgid "No detailed info available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:426
 msgid "No detailed information is available for books on the device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:486
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:478
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:506
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:487
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:479
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using third party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:492
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:507
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:547
 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."
+"you find it useful, please consider donating to support its development. "
+"Your donation helps keep calibre development going."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:573
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:576
 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/ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:640
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:633
 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/update.py:52
-msgid ""
-"<span style=\"color:red; font-weight:bold\">Latest version: <a "
-"href=\"%s\">%s</a></span>"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/update.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:56
 msgid "Update available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/update.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:57
 msgid ""
 "%s has been updated to version %s. See the <a href=\"http://calibre-"
 "ebook.com/whats-new\">new features</a>. Visit the download page?"
@@ -8354,29 +8442,25 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:270
 msgid ""
 "Library\n"
-"%d\n"
-"books"
+"%d books"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:271
 msgid ""
 "Reader\n"
-"%s\n"
-"available"
+"%s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:272
 msgid ""
 "Card A\n"
-"%s\n"
-"available"
+"%s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:273
 msgid ""
 "Card B\n"
-"%s\n"
-"available"
+"%s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:277
@@ -8399,35 +8483,39 @@ msgstr ""
 msgid "Books located at"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:306
+msgid "free"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:557
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:558
 msgid "Upper Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:559
 msgid "Lower Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:560
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:561
 msgid "Title Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:974
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:983
 msgid "Drag to resize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1015
 msgid "Show"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1012
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1022
 msgid "Hide"
 msgstr ""
 
@@ -9696,89 +9784,89 @@ msgstr ""
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:706
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:708
 msgid "Download finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:708
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:710
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:714
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:716
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:716
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:718
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:718
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:720
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:807
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:809
 msgid "Could not fetch article. Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:828
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:830
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:833
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:835
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:839
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:841
 msgid "Trying to download cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:841
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:922
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:924
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:938
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:940
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:948
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:950
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:960
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
 msgid "Downloading cover from %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1002
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1190
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1192
 msgid "Untitled Article"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1261
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1263
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1272
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1274
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1289
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1291
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1436
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1438
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1452
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1454
 msgid ""
 "You do not have permission to download this issue. Either your subscription "
 "has expired or you have exceeded the maximum allowed downloads for today."
diff --git a/src/calibre/translations/fr.po b/src/calibre/translations/fr.po
index b80988d22d..6e815aa26a 100644
--- a/src/calibre/translations/fr.po
+++ b/src/calibre/translations/fr.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre 0.4.22\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-03 01:21+0000\n"
-"PO-Revision-Date: 2010-07-03 11:11+0000\n"
+"POT-Creation-Date: 2010-07-10 16:12+0000\n"
+"PO-Revision-Date: 2010-07-15 14:45+0000\n"
 "Last-Translator: sengian <Unknown>\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: 2010-07-04 03:43+0000\n"
+"X-Launchpad-Export-Date: 2010-07-16 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Bookmarks: 1177,-1,-1,-1,-1,-1,-1,-1,-1,-1\n"
 "Generated-By: pygettext.py 1.5\n"
@@ -28,10 +28,10 @@ msgstr "Ne fait strictement rien"
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:71
 #: /home/kovid/work/calibre/src/calibre/devices/prs500/books.py:267
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:466
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:396
-#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:98
-#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:101
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:492
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:398
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:97
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:100
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/metadata.py:56
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:428
 #: /home/kovid/work/calibre/src/calibre/ebooks/fb2/input.py:67
@@ -73,9 +73,9 @@ msgstr "Ne fait strictement rien"
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:818
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:49
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:51
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:910
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:915
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:981
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:911
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:916
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:982
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:137
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:139
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:108
@@ -103,20 +103,20 @@ msgstr "Ne fait strictement rien"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:233
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:290
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:815
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:818
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:814
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:817
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:172
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:179
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:22
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:135
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:903
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:912
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1192
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1195
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:899
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:908
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1191
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1194
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:120
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:155
@@ -124,8 +124,8 @@ msgstr "Ne fait strictement rien"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:172
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:362
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:877
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1054
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:882
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1060
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:87
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:92
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:185
@@ -171,7 +171,7 @@ msgstr "Éditeur de métadonnées"
 msgid "Catalog generator"
 msgstr "Générateur de catalogue"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:15
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:16
 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 "
@@ -181,7 +181,7 @@ msgstr ""
 "contenant tous les fichiers liés. Ce plug-in est lancé chaque fois que vous "
 "ajoutez un fichier HTML à la bibliothèque."
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:51
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:52
 msgid ""
 "Character encoding for the input HTML files. Common choices include: cp1252, "
 "latin1, iso-8859-1 and utf-8."
@@ -189,7 +189,7 @@ msgstr ""
 "Encodage des caractères pour les fichiers HTML en entrée. Les choix les plus "
 "communs incluent : cp1252, latin1, iso-8859-1 et utf-8."
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:58
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:59
 msgid ""
 "Create a PMLZ archive containing the PML file and all images in the "
 "directory pmlname_img or images. This plugin is run every time you add a PML "
@@ -199,49 +199,49 @@ msgstr ""
 "le répertoire pmlname_img ou images. Ce plugin est lancé à chaque ajout d'un "
 "fichier PML dans la bibliothèque."
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:90
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:93
 msgid "Extract cover from comic files"
 msgstr "Extraction de la couverture depuis des fichiers de bandes dessinées"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:117
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:128
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:140
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:150
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:160
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:171
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:181
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:191
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:201
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:211
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:221
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:232
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:243
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:255
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:276
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:287
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:297
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:307
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:120
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:131
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:153
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:163
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:174
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:184
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:194
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:204
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:214
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:224
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:235
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:246
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:258
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:279
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:290
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:300
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:310
 msgid "Read metadata from %s files"
 msgstr "Lecture des métadonnées depuis les fichiers %s"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:266
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:269
 msgid "Read metadata from ebooks in RAR archives"
 msgstr "Lecture des métadonnées des ebooks contenus dans les archives RAR"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:318
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:321
 msgid "Read metadata from ebooks in ZIP archives"
 msgstr "Lecture des métadonnées des ebooks contenus dans les archives ZIP"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:331
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:341
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:351
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:373
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:384
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:394
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:334
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:344
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:354
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:376
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:387
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:397
 msgid "Set metadata in %s files"
 msgstr "Définir les métadonnées des fichiers %s"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:362
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:365
 msgid "Set metadata from %s files"
 msgstr "Définir les métadonnées à partir des fichiers %s"
 
@@ -400,35 +400,35 @@ msgstr ""
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr "Ce profil est prévu pour le Kindle DX d'Amazon."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:31
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
 msgid "Installed plugins"
 msgstr "Plugins installés"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:33
 msgid "Mapping for filetype plugins"
 msgstr "Liaisons pour les plugins d'import/export"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:33
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:34
 msgid "Local plugin customization"
 msgstr "Personnalisation des plugins locaux"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:34
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
 msgid "Disabled plugins"
 msgstr "Plugins désactivés."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
 msgid "Enabled plugins"
 msgstr "Plugins activés"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:83
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:84
 msgid "No valid plugin found in "
 msgstr "Absence de plugin compatible dans "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:460
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:468
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr "L'initialisation du plugin %s a échoué en laissant une trace:"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:493
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
 msgid ""
 "    %prog options\n"
 "\n"
@@ -440,18 +440,18 @@ msgstr ""
 "    Personnaliser Calibre en chargeant des modules additionnels externes.\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:499
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr ""
 "Ajouter un plugin en précisant le chemin vers le fichier zip qui le contient."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 "Suppression d'un plugin personnalisé d'après son nom. Ceci n'a pas d'effet "
 "sur les plugins intégrés."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:503
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:511
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
@@ -459,15 +459,15 @@ msgstr ""
 "Personnaliser le plugin. Spécifier le nom du plugin et la chaîne de "
 "personnalisation séparés par une virgule."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:505
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:513
 msgid "List all installed plugins"
 msgstr "Lister tous les plugins installés"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Enable the named plugin"
 msgstr "Activer le plugin nommé"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Disable the named plugin"
 msgstr "Désactive le plugin nommé"
 
@@ -625,7 +625,7 @@ msgstr "Communiquer avec les lecteurs d'ebook Hanlin V5."
 msgid "Communicate with the BOOX eBook reader."
 msgstr "Communiquer avec le lecteur d'ebook BOOX."
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:121
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:123
 msgid ""
 "Comma separated list of directories to send e-books to on the device. The "
 "first one that exists will be used."
@@ -698,34 +698,34 @@ msgstr "Communiquer avec le lecteur Kobo"
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:51
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:54
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:57
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:157
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:159
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:64
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:67
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:70
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:130
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:137
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:160
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:139
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:162
 msgid "Getting list of books on device..."
 msgstr "Lit la liste des livres de l'appareil..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:218
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:258
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:244
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:262
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:219
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:263
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:246
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:264
 msgid "Removing books from device..."
 msgstr "Supprime les livres de l'appareil..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:262
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:269
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:269
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:274
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:267
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:274
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:271
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:276
 msgid "Removing books from device metadata listing..."
 msgstr "Supprime les livres de la liste des métadonnées de l'appareil..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:274
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:308
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:208
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:238
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:313
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:210
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:240
 msgid "Adding books to device metadata listing..."
 msgstr "Ajoute les livres à liste des métadonnées de l'appareil..."
 
@@ -741,6 +741,10 @@ msgstr "Communiquer avec le Booq Avant"
 msgid "Communicate with the Sweex MM300"
 msgstr "Communiquer avec le Sweex MM300"
 
+#: /home/kovid/work/calibre/src/calibre/devices/misc.py:75
+msgid "Communicate with the Pandigital Novel"
+msgstr "Communiquer avec le Pandigital Novel"
+
 #: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:17
 msgid "Communicate with the Nokia 770 internet tablet."
 msgstr "Communiquer avec la tablette internet Nokia 770."
@@ -893,12 +897,12 @@ msgstr "Communiquer avec un lecteur d'ebook."
 msgid "Get device information..."
 msgstr "Lit les informations de l'appareil..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:188
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:192
 msgid "Transferring books to device..."
 msgstr "Transfère les livres vers l'appareil..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:305
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:307
 msgid "Sending metadata to device..."
 msgstr "Envoie les métadonnées vers l'appareil..."
 
@@ -1686,6 +1690,70 @@ msgstr "Démarrage les transformations de l'ebook...."
 msgid "Creating"
 msgstr "Création"
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/__init__.py:18
+msgid "ePub Fixer"
+msgstr "Réparateur d'ePub"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/epubcheck.py:18
+msgid "Workaround epubcheck bugs"
+msgstr "Solution provisoire pour les bugs epubcheck"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/epubcheck.py:22
+msgid ""
+"Workarounds for bugs in the latest release of epubcheck. epubcheck reports "
+"many things as errors that are not actually errors. epub-fix will try to "
+"detect these and replace them with constructs that epubcheck likes. This may "
+"cause significant changes to your epub, complain to the epubcheck project."
+msgstr ""
+"Solution de rechange pour les bogues dans la dernière distribution "
+"d'epubcheck. epubcheck décèle beaucoup de fausses erreurs. epub-fix va "
+"essayer de trouver ces fausses erreurs et de les changer en forme qui ne "
+"gène pas epubcheck. Il est possible que cette action change "
+"significativement votre fichier epub. Veuillez adresser vos plaintes au "
+"projet epubcheck."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:19
+msgid ""
+"%prog [options] file.epub\n"
+"\n"
+"Fix common problems in EPUB files that can cause them to be rejected by "
+"poorly designed publishing services.\n"
+"\n"
+"By default, no fixing is done and messages are printed out for each error "
+"detected. Use the options to control which errors are automatically fixed."
+msgstr ""
+"%prog [options] fichier.epub\n"
+"\n"
+"Résout des problèmes courants de fichiers EPUB pouvant causer leur rejet par "
+"des services de publication mal conçus.\n"
+"\n"
+"Par défaut, aucune réparation n'est effectuée et un message est affiché pour "
+"chaque erreur détectée. Utilisez les options pour contrôler quelles erreurs "
+"sont résolues automatiquement."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:50
+msgid "You must specify an epub file"
+msgstr "Vous devez spécifiez un fichier epub"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:17
+msgid "Fix unmanifested files"
+msgstr "Réparer les fichiers ne contenant pas de manifeste"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:21
+msgid ""
+"Fix unmanifested files. epub-fix can either add them to the manifest or "
+"delete them as specified by the delete unmanifested option."
+msgstr ""
+"Ajouter les fichiers pas déjà dans le manifeste.  epub-fix peut soit ajouter "
+"les fichier au manifeste soit les supprimer selon l'option \"delete "
+"unmanifested\"."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:32
+msgid "Delete unmanifested files instead of adding them to the manifest"
+msgstr ""
+"Supprimer les fichiers absents du manifeste au lieu de les ajouter au "
+"manifeste."
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:56
 msgid ""
 "Extract the contents of the generated EPUB file to the specified directory. "
@@ -2062,11 +2130,11 @@ msgstr "Bande dessinées"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:98
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:882
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:887
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:543
 msgid "Title"
 msgstr "Titre"
@@ -2075,7 +2143,7 @@ msgstr "Titre"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:364
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:883
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:888
 msgid "Author(s)"
 msgstr "Auteur(s)"
 
@@ -2098,7 +2166,7 @@ msgstr "Producteur"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:67
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:318
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1073
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1079
 msgid "Comments"
 msgstr "Commentaires"
 
@@ -2107,7 +2175,7 @@ msgstr "Commentaires"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:306
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1069
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1075
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:139
 msgid "Tags"
 msgstr "Etiquettes"
@@ -2117,7 +2185,7 @@ msgstr "Etiquettes"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:323
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1084
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:87
 msgid "Series"
 msgstr "Séries"
@@ -2127,7 +2195,7 @@ msgid "Language"
 msgstr "Langue"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:406
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1067
 msgid "Timestamp"
 msgstr "Horodatage"
 
@@ -2402,7 +2470,7 @@ msgstr ""
 "à partir de LibraryThing.com\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1226
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1398
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1399
 msgid "Cover"
 msgstr "Couverture"
 
@@ -2447,70 +2515,70 @@ msgstr "Tous les articles"
 msgid "This is an Amazon Topaz book. It cannot be processed."
 msgstr "C'est un livre Amazon Topaz. Il ne peut pas être traité."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1399
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1400
 msgid "Title Page"
 msgstr "Page de titre"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1400
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1401
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:15
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:53
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:194
 msgid "Table of Contents"
 msgstr "Tables des matières"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1401
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1402
 msgid "Index"
 msgstr "Index"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1402
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1403
 msgid "Glossary"
 msgstr "Glossaire"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1403
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1404
 msgid "Acknowledgements"
 msgstr "Remerciements"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1404
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1405
 msgid "Bibliography"
 msgstr "Bibliographie"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1405
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1406
 msgid "Colophon"
 msgstr "Marque de l'imprimeur"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1406
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1407
 msgid "Copyright"
 msgstr "Copyright"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1407
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1408
 msgid "Dedication"
 msgstr "Dédicace"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1408
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1409
 msgid "Epigraph"
 msgstr "Epigraphe"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1409
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1410
 msgid "Foreword"
 msgstr "Avant-propos"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1410
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1411
 msgid "List of Illustrations"
 msgstr "Liste d'illustrations"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1411
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1412
 msgid "List of Tables"
 msgstr "Liste de Tables"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1412
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1413
 msgid "Notes"
 msgstr "Notes"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1413
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1414
 msgid "Preface"
 msgstr "Préface"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1414
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1415
 msgid "Main Text"
 msgstr "Texte principal"
 
@@ -2556,7 +2624,7 @@ msgstr "Panneau latéral"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:22
 #: /home/kovid/work/calibre/src/calibre/ebooks/tcr/input.py:23
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:23
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:24
 msgid ""
 "Normally calibre treats blank lines as paragraph markers. With this option "
 "it will assume that every line represents a paragraph instead."
@@ -2567,7 +2635,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:26
 #: /home/kovid/work/calibre/src/calibre/ebooks/tcr/input.py:27
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:27
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:28
 msgid ""
 "Normally calibre treats blank lines as paragraph markers. With this option "
 "it will assume that every line starting with an indent (either a tab or 2+ "
@@ -2732,7 +2800,7 @@ msgstr ""
 "Obtenir des informations à propos d'un PDF.\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
 msgid "Author"
 msgstr "Auteur"
@@ -2910,7 +2978,7 @@ msgstr ""
 "la plus faible, mais la plus rapide et 10 étant la compression la plus "
 "élevée mais la plus lente."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:33
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:34
 msgid ""
 "Normally extra spaces are condensed into a single space. With this option "
 "all spaces will be displayed."
@@ -2918,7 +2986,7 @@ msgstr ""
 "Normalement les espaces surnuméraires sont condensés en un seul espace. Avec "
 "cette option, toutes les espaces seront affichées."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:36
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:37
 msgid ""
 "Run the text input through the markdown pre-processor. To learn more about "
 "markdown see"
@@ -2926,7 +2994,7 @@ msgstr ""
 "Exécute le texte en entrée via le pré-processeur markdown. Pour en apprendre "
 "plus à propos de markdown voir"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:39
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:40
 msgid "Do not insert a Table of Contents into the output text."
 msgstr "Ne pas insérer une table des matières dans le texte de sortie."
 
@@ -3112,7 +3180,7 @@ msgstr "Copier"
 msgid "Copy to Clipboard"
 msgstr "Copier dans le Presse-papiers"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:400
 msgid "Choose Files"
 msgstr "Choisir les fichiers"
 
@@ -3129,13 +3197,13 @@ msgstr ""
 "uniquement"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:75
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:612
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:671
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:708
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:729
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:877
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1060
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:670
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:707
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:728
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:876
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:941
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1059
 msgid "No books selected"
 msgstr "Aucun livre sélectionné"
 
@@ -3176,144 +3244,144 @@ msgstr "Combien de livres vides?"
 msgid "How many empty books should be added?"
 msgstr "Combien de livres vides doivent être ajoutés?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:340
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:390
 msgid "Uploading books to device."
 msgstr "Téléchargement des livres vers l'appareil."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:350
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:137
 msgid "Books"
 msgstr "Livres"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
 msgid "EPUB Books"
 msgstr "Livres EPUB"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
 msgid "LRF Books"
 msgstr "Livres LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
 msgid "HTML Books"
 msgstr "Livres HTML"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
 msgid "LIT Books"
 msgstr "Livres LIT"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
 msgid "MOBI Books"
 msgstr "Livres MOBI"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
 msgid "Topaz books"
 msgstr "Livres Topaz"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
 msgid "Text books"
 msgstr "Livres Texte"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:359
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
 msgid "PDF Books"
 msgstr "Livres PDF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:359
 msgid "Comics"
 msgstr "Bande Dessinées"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:360
 msgid "Archives"
 msgstr "Archives"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:364
 msgid "Supported books"
 msgstr "Livres supportés"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:399
 msgid "Merged some books"
 msgstr "Fusionne des livres"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:401
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:400
 msgid ""
 "Some duplicates were found and merged into the following existing books:"
 msgstr ""
 "Des doublons ont été trouvés et fusionnés dans les livres existants suivants:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:409
 msgid "Failed to read metadata"
 msgstr "Impossible de lire les métadonnées"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:410
 msgid "Failed to read metadata from the following"
 msgstr "Impossible de lire les métadonnées à partir de"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:434
 msgid "Add to library"
 msgstr "Ajouter à la bibliothèqye"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:460
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1229
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:459
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1228
 msgid "No book selected"
 msgstr "Aucun livre sélectionné"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:434
 msgid "No book files found"
 msgstr "Aucun fichier de livres trouvé"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:456
 msgid "Cannot delete"
 msgstr "Impossible de supprimer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:469
 msgid "Choose formats to be deleted"
 msgstr "Choisir les formats à supprimer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:488
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:487
 msgid "Choose formats <b>not</b> to be deleted"
 msgstr "Choisir les formats à  <b>ne pas</b> supprimer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:507
 msgid "Cannot delete books"
 msgstr "Impossible d'effacer les livres"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:509
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:508
 msgid "No device is connected"
 msgstr "Aucun appareil n'est connecté"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:519
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:518
 msgid "Main memory"
 msgstr "Mémoire principale"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:520
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:444
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:519
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:454
 msgid "Storage Card A"
 msgstr "Carte mémoire A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:521
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:446
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:455
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:447
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:456
 msgid "Storage Card B"
 msgstr "Carte mémoire B"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:525
 msgid "No books to delete"
 msgstr "Aucun livre à effacer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:526
 msgid "None of the selected books are on the device"
 msgstr "Aucun des livres sélectionnés n'est sur l'appareil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:544
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:600
 msgid "Deleting books from device."
 msgstr "Suppression des livres dans l'appareil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:564
 msgid ""
 "The selected books will be <b>permanently deleted</b> and the files removed "
 "from your computer. Are you sure?"
@@ -3321,7 +3389,7 @@ msgstr ""
 "Les livres sélectionnés vont être <b>supprimés définitivement</b> et les "
 "fichiers seront supprimés de votre ordinateur. Etes-vous sûr ?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:585
 msgid ""
 "The selected books will be <b>permanently deleted</b> from your device. Are "
 "you sure?"
@@ -3329,61 +3397,61 @@ msgstr ""
 "Les livres sélectionnés seront <b>effacés de manière permanente</b> de votre "
 "appareil. Etes vous sûr de votre choix?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:610
 msgid "Cannot download metadata"
 msgstr "Impossible de télécharger les métadonnées"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:627
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
 msgid "social metadata"
 msgstr "Métadonnées sociales"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
 msgid "covers"
 msgstr "couvertures"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
 msgid "metadata"
 msgstr "métadonnées"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:630
 msgid "Downloading %s for %d book(s)"
 msgstr "Télécharge les livres %s sur %d"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:654
 msgid "Failed to download some metadata"
 msgstr "Le téléchargement d'une partie des métadonnées a échoué"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:656
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
 msgid "Failed to download metadata for the following:"
 msgstr "Le téléchargement des métadonnées a échoué pour :"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:659
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:658
 msgid "Failed to download metadata:"
 msgstr "Le téléchargement des métadonnées a échoué:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:660
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:637
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:522
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:949
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:659
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:638
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:951
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
 msgid "Error"
 msgstr "Erreur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:670
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:707
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:669
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:706
 msgid "Cannot edit metadata"
 msgstr "Impossible d'éditer les métadonnées"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:728
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:731
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:727
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:730
 msgid "Cannot merge books"
 msgstr "Impossible de fusionner les livres"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:732
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:731
 msgid "At least two books must be selected for merging"
 msgstr "Au moins deux livres doivent être séléctionnés avant de fusionner"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:736
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:735
 msgid ""
 "All book formats and metadata from the selected books will be added to the "
 "<b>first selected book.</b><br><br> The second and subsequently selected "
@@ -3395,7 +3463,7 @@ msgstr ""
 "suivants sélectionnés ne seront ni supprimés ni changés.<br><br>Veuille "
 "confirmer que vous voulez lancer le traitement."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:747
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:746
 msgid ""
 "All book formats and metadata from the selected books will be merged into "
 "the <b>first selected book</b>.<br><br>After merger the second and "
@@ -3412,7 +3480,7 @@ msgstr ""
 "définitivement <b>supprimés</b> de votre ordinateur.<br><br> Êtes vous "
 "<b>sûr</b> de vouloir lancer le traitement ?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:759
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:758
 msgid ""
 "You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
 "proceed?"
@@ -3420,45 +3488,45 @@ msgstr ""
 "Vous allez fusionner plus de 5 livres. Etes-vous <b>sûr</b> de vouloir "
 "lancer le traitement ?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:876
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:875
 msgid "Cannot save to disk"
 msgstr "Impossible de sauvegarder sur le disque"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:878
 msgid "Choose destination directory"
 msgstr "Choisir le répertoire de destination"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:912
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:911
 msgid "Error while saving"
 msgstr "Erreur pendant la sauvegarde"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:913
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:912
 msgid "There was an error while saving."
 msgstr "Il y a eu une erreur lors de la sauvegarde."
 
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:919
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:920
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:921
 msgid "Could not save some books"
 msgstr "Impossible de sauvegarder certains livres"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:922
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:921
 msgid "Click the show details button to see which ones."
 msgstr "Cliquer le bouton afficher les détails pour voir lesquels."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
 msgid "No books selected to generate catalog for"
 msgstr "Aucun livre sélectionné pour générer le catalogue pour"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:960
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:959
 msgid "Generating %s catalog..."
 msgstr "Génère le catalogue %s..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:965
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:964
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:264
 msgid "No books found"
 msgstr "Aucun livre trouvé"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:966
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:965
 msgid ""
 "No books to catalog\n"
 "Check exclude tags"
@@ -3466,49 +3534,49 @@ msgstr ""
 "Aucun livre vers le catalogue\n"
 "Vérifier les étiquettes d'exclusion"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:976
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:975
 msgid "Catalog generated."
 msgstr "Catalogue généré."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:979
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:978
 msgid "Export Catalog Directory"
 msgstr "Répertoire d'export du catalogue"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:980
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:979
 msgid "Select destination for %s.%s"
 msgstr "Sélectionner la destination pour %s.%s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:996
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:995
 msgid "Fetching news from "
 msgstr "Récupération des News de "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1009
 msgid " fetched."
 msgstr " récupéré."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1059
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1058
 msgid "Cannot convert"
 msgstr "Conversion impossible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1088
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1087
 msgid "Starting conversion of %d book(s)"
 msgstr "Démarrer la conversion de %d livre(s)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1265
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1264
 msgid "Cannot view"
 msgstr "Impossible de visualiser"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1209
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
 msgid "Choose the format to view"
 msgstr "Choisir le format à afficher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1218
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1217
 msgid "Multiple Books Selected"
 msgstr "Plusieurs livres sélectionnés"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1219
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1218
 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 "
@@ -3520,11 +3588,11 @@ msgstr ""
 "réponses de l'ordinateur. Une fois démarré le processus ne peut pas être "
 "arrêté avant la fin. Voulez-vous continuer ?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1227
 msgid "Cannot open folder"
 msgstr "Impossible d'ouvrir le dossier"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1266
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1265
 msgid "%s has no available formats."
 msgstr "%s n'a pas de format disponible."
 
@@ -3549,7 +3617,7 @@ msgid "The specified directory could not be processed."
 msgstr "Le chemin spécifié ne peut pas être traité."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:845
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr "Aucun livre"
 
@@ -3688,15 +3756,15 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:52
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:633
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:637
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:366
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:371
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:385
@@ -3720,12 +3788,12 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:259
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:265
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:186
@@ -3759,8 +3827,9 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:313
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1059
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1065
 msgid "Path"
 msgstr "Chemin"
 
@@ -3777,8 +3846,8 @@ msgid "Formats"
 msgstr "Formats"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:25
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:886
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1062
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:891
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1068
 msgid "Collections"
 msgstr "Collections"
 
@@ -3791,12 +3860,12 @@ msgstr "Cliquer pour ouvrir"
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:305
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:311
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:317
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1068
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1072
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1074
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:458
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:274
 msgid "None"
 msgstr "Aucun"
 
@@ -4691,12 +4760,12 @@ msgid "Footer regular expression:"
 msgstr "Expression régulière pour le pied de page:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:56
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:76
 msgid "Invalid regular expression"
 msgstr "Expression régulière incorrecte"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:77
 msgid "Invalid regular expression: %s"
 msgstr "Expression régulière incorrecte: %s"
 
@@ -4921,11 +4990,11 @@ msgstr ""
 "XPath consulter le <a href=\"http://calibre-"
 "ebook.com/user_manual/xpath.html\">Tutoriel XPath</a>."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:127
 msgid "Cover browser could not be loaded"
 msgstr "Le navigateur de coverture ne peut ête chargé"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:179
 msgid "Browse by covers"
 msgstr "Navigation par couvertures"
 
@@ -4984,124 +5053,124 @@ msgstr "étiquettes à ajouter"
 msgid "tags to remove"
 msgstr "étiquettes à supprimer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:49
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:135
 msgid "No details available."
 msgstr "Pas de détail disponible."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:155
 msgid "Device no longer connected."
 msgstr "L'appareil n'est plus connecté."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:270
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:271
 msgid "Get device information"
 msgstr "Lit les informations de l'appareil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:282
 msgid "Get list of books on device"
 msgstr "Lire la liste de livres à partir de l'appareil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:292
 msgid "Get annotations from device"
 msgstr "Obtenir les annotations à partir de l'appareil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:301
 msgid "Send metadata to device"
 msgstr "Envoie les métadonnées vers l'appareil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:305
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:306
 msgid "Send collections to device"
 msgstr "Envoyer les collections vers l'appareil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:330
 msgid "Upload %d books to device"
 msgstr "Envoie le livre %d dans l'appareil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:345
 msgid "Delete books from device"
 msgstr "Supprimer les livres dans l'appareil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:362
 msgid "Download books from device"
 msgstr "Télécharger les livres à partir de l'appareil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:372
 msgid "View book on device"
 msgstr "Afficher le livre sur l'appareil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:408
 msgid "Set default send to device action"
 msgstr "Indiquer l'action par défaut pour 'envoyer au lecteur'"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:413
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:420
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:422
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:425
 msgid "Email to"
 msgstr "Email vers"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:425
 msgid " and delete from library"
 msgstr " et efface de la bibliothèque"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:434
 msgid "Send to main memory"
 msgstr "Envoyer vers la mémoire du lecteur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:436
 msgid "Send to storage card A"
 msgstr "Envoyer vers la carte mémoire A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:437
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:438
 msgid "Send to storage card B"
 msgstr "Envoyer vers la carte mémoire B"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:442
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:452
 msgid "Main Memory"
 msgstr "Mémoire principale"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:469
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:470
 msgid "Send and delete from library"
 msgstr "Envoyer et effacer de la bibliothèque"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:471
 msgid "Send specific format"
 msgstr "Envoyer un format spécifique"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:509
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:510
 msgid "Connect to folder"
 msgstr "Connecter au dossier"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:516
 msgid "Connect to iTunes"
 msgstr "Connecter à iTunes"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:521
 msgid "Eject device"
 msgstr "Ejecter l'appareil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:529
 msgid "Fetch annotations (experimental)"
 msgstr "Récupérer les annotations (expérimental)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:638
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:639
 msgid "Error communicating with device"
 msgstr "Erreur pendant la communication avec le lecteur électronique"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:659
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:660
 msgid "Select folder to open as device"
 msgstr "Sélectionner le dossier à ouvrir comme appareil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:704
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:705
 msgid "Failed"
 msgstr "Echec"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:710
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:711
 msgid "Error talking to device"
 msgstr "Erreur pendant la communication avec le lecteur électronique"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:711
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:712
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -5110,128 +5179,124 @@ msgstr ""
 "lecteur électronique. Veuillez déconnecter et reconnecter le lecteur "
 "électronique et redémarrer."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:753
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:754
 msgid "Device: "
 msgstr "Appareil: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:755
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:756
 msgid " detected."
 msgstr " detecté."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:778
-msgid "Connected "
-msgstr "Connecté: "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:846
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr "sélectionné pour l'envoi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:851
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:847
 msgid "Choose format to send to device"
 msgstr "Choisir le format à envoyer au lecteur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:860
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:856
 msgid "No device"
 msgstr "Aucun appareil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:857
 msgid "Cannot send: No device is connected"
 msgstr "Impossible d'envoyer: Aucun appareil connecté"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:860
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:868
 msgid "No card"
 msgstr "Aucune carte"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:869
 msgid "Cannot send: Device has no storage card"
 msgstr "Impossible d'envoyer: L'appareil n'a pas de carte mémoire"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:910
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:906
 msgid "E-book:"
 msgstr "E-book:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:913
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:909
 msgid "Attached, you will find the e-book"
 msgstr "En pièce jointe, vous trouverez l'ebook"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:910
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:181
 msgid "by"
 msgstr "par"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:915
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:911
 msgid "in the %s format."
 msgstr "dans le format %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:928
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:924
 msgid "Sending email to"
 msgstr "Envoi d'un email à"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:958
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:965
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1057
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1118
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1236
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:954
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:962
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1054
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1235
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:1243
 msgid "No suitable formats"
 msgstr "Pas de format convenable"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:959
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:955
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 "Convertir automatiquement les livres suivants avant de les envoyer par email "
 "?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:966
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:963
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 "Impossible d'envoyer par email les livres suivants car aucun format "
 "convenable n'a été trouvé :"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:984
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:981
 msgid "Failed to email books"
 msgstr "L'envoi par email des livres a échoué"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:985
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:982
 msgid "Failed to email the following books:"
 msgstr "L'envoi par email des livres suivants a échoué:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:989
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:986
 msgid "Sent by email:"
 msgstr "Envoyer par email:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1016
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1013
 msgid "News:"
 msgstr "News:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1017
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1014
 msgid "Attached is the"
 msgstr "Le fichier attaché est"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1028
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1025
 msgid "Sent news to"
 msgstr "Envoi des News vers"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1058
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1237
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1055
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1117
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1236
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 "Convertir automatiquement les livres suivants avant de les télécharger dans "
 "l'appareil ?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1087
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1085
 msgid "Sending catalogs to device."
 msgstr "Envoie les catalogues vers l'appareil."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1150
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1149
 msgid "Sending news to device."
 msgstr "Envoi les News vers l'appareil."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1202
 msgid "Sending books to device."
 msgstr "Envoie les livres dans l'appareil."
 
@@ -5289,7 +5354,7 @@ msgid "My Books"
 msgstr "Mes Livres"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:69
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:289
 msgid "Generate catalog"
 msgstr "Générer le catalogue"
 
@@ -5433,11 +5498,11 @@ msgstr "Large"
 msgid "Narrow"
 msgstr "Etroit"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:503
 msgid "System port selected"
 msgstr "Port système sélectionné"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:503
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:504
 msgid ""
 "The value <b>%d</b> you have chosen for the content server port is a system "
 "port. Your operating system <b>may</b> not allow the server to run on this "
@@ -5448,135 +5513,135 @@ msgstr ""
 "empêcher le serveur de fonctionner sur ce port. Par sécurité choisissez "
 "plutôt un numéro de port supérieur à 1024."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:524
 msgid "Failed to install command line tools."
 msgstr "L'installation des outils en ligne de commande a échouée."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:527
 msgid "Command line tools installed"
 msgstr "Outils en ligne de commande installés."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:528
 msgid "Command line tools installed in"
 msgstr "Outils en ligne de commande installés dans"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:529
 msgid ""
 "If you move calibre.app, you have to re-install the command line tools."
 msgstr ""
 "Si vous déplacez calibre.app, vous devez réinstaller les outils en ligne de "
 "commande."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:580
 msgid "No valid plugin path"
 msgstr "N'est pas un chemin correct pour les plugins"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:581
 msgid "%s is not a valid plugin path"
 msgstr "%s n'est pas un répertoire correct pour les plugins"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:584
 msgid "Choose plugin"
 msgstr "Choisir le plugin"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:596
 msgid "Plugin cannot be disabled"
 msgstr "Le plugin ne peut pas être désactivé"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:597
 msgid "The plugin: %s cannot be disabled"
 msgstr "Le plugin %s ne peut pas être désactivé"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:606
 msgid "Plugin not customizable"
 msgstr "Le plugin ne peut pas être personnalisé"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:607
 msgid "Plugin: %s does not need customization"
 msgstr "Le plugin %s ne peut pas être personnalisé"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:615
 msgid "Customize"
 msgstr "Personnaliser"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:652
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:653
 msgid "Cannot remove builtin plugin"
 msgstr "Impossible de supprimer les plugins natifs"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:653
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:654
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 " ne peut pas être retiré. C'est un plugin natif. Essayer plutôt de le "
 "désactiver"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:684
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:685
 msgid "You must select a column to delete it"
 msgstr "Vous devez sélectionner une colonne pour pouvoir la supprimer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:690
 msgid "The selected column is not a custom column"
 msgstr "La colonne sélectionnée n'est pas une colonne personnalisée"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:690
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:691
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
 msgid "Are you sure?"
 msgstr "Etes vous sur ?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:691
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:692
 msgid "Do you really want to delete column %s and all its data?"
 msgstr ""
 "Voulez vous vraiment supprimer la colonne %s et toutes les données qu'elle "
 "contient?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:758
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:759
 msgid "Error log:"
 msgstr "Journal d'erreur:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:765
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:766
 msgid "Access log:"
 msgstr "Journal des accès:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:793
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:794
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:331
 msgid "Failed to start content server"
 msgstr "A échoué lors du démarrage du serveur de contenu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:817
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:818
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:587
 msgid "Select location for books"
 msgstr "Sélectionner l'emplacement pour les livres"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:824
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:825
 msgid "Invalid size"
 msgstr "Taille incorrecte"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:825
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:826
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr "La taille %s est incorrecte. Doit être au format largeurxhauteur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:884
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:889
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:891
 msgid "Invalid database location"
 msgstr "Le chemin de la base de données n'est pas correct"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:885
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:887
 msgid "Invalid database location "
 msgstr "Le chemin de la base de données n'est pas correct "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:888
 msgid "<br>Must be a directory."
 msgstr "<br>Doit être un répertoire."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:890
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:892
 msgid "Invalid database location.<br>Cannot write to "
 msgstr ""
 "Le chemin de la base de données n'est pas correct.<br>Erreur en écriture "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:895
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:897
 msgid "Must restart"
 msgstr "Redémarrage nécessaire"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:896
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:898
 msgid ""
 "The changes you made require that Calibre be restarted. Please restart as "
 "soon as practical."
@@ -5584,19 +5649,19 @@ msgstr ""
 "Les modifications effectuées nécessitent un redémarrage de Calibre. Veuillez "
 "redémarrer dès que possible."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:930
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:932
 msgid "Checking database integrity"
 msgstr "Vérifier l'intégrité de la base de données"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:950
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:952
 msgid "Failed to check database integrity"
 msgstr "La vérification de l'intégrité de la base de données a échouée"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:957
 msgid "Some inconsistencies found"
 msgstr "Des incohérences ont été trouvées"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:956
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:958
 msgid ""
 "The following books had formats listed in the database that are not actually "
 "available. The entries for the formats have been removed. You should check "
@@ -5608,11 +5673,11 @@ msgstr ""
 "Vous devrez les vérifier manuellement. Ceci peut arriver si vous avez "
 "manipulé les fichiers directement dans le dossier de la bibliothèque."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:133
 msgid "TabWidget"
 msgstr "Widget avec onglet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:134
 msgid ""
 "Here you can control how calibre will read metadata from the files you add "
 "to it. calibre can either read metadata from the contents of the file, or "
@@ -5622,11 +5687,11 @@ msgstr ""
 "fichiers que vous ajoutez. Calibre peut lire les métadonnées à partir du "
 "contenu du fichier, ou du nom de fichier."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:135
 msgid "Read metadata only from &file name"
 msgstr "Lire les métadonnées uniquement à partir du nom de &fichier"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:136
 msgid ""
 "Swap the firstname and lastname of the author. This affects only metadata "
 "read from file names."
@@ -5634,11 +5699,11 @@ msgstr ""
 "Echanger le prénom et le nom de l'auteur. Ceci affecte seulement les "
 "métadonnées lues à partir des noms de fichiers."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:137
 msgid "&Swap author firstname and lastname"
 msgstr "&Echanger le prénom et le nom de l'auteur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:138
 msgid ""
 "If an existing book with a similar title and author is found that does not "
 "have the format being added, the format is added\n"
@@ -5658,7 +5723,7 @@ msgstr ""
 "la ponctuation, la casse, etc. La recherche de correspondance est exacte "
 "pour l'auteur."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:142
 msgid ""
 "If books with similar titles and authors found, &merge the new files "
 "automatically"
@@ -5666,15 +5731,15 @@ msgstr ""
 "Si des livres avec des titres et des auteurs similaires sont trouvés, "
 "&fusionner les nouveaux fichiers automatiquement"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:143
 msgid "&Configure metadata from file name"
 msgstr "&Configurer les métadonnées à partir du nom de fichier"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:144
 msgid "&Adding books"
 msgstr "&Ajout de livres"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:145
 msgid ""
 "Here you can control how calibre will save your books when you click the "
 "Save to Disk button:"
@@ -5682,65 +5747,79 @@ msgstr ""
 "Ici vous pouvez contrôler comment Calibre va sauvegarder vos livres quand "
 "vous cliquez sur le bouton Sauvegarder sur le disque:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:146
 msgid "Save &cover separately"
 msgstr "Sauvegarder les &couvertures séparément"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:147
 msgid "Update &metadata in saved copies"
 msgstr "Mettre à jour les &métadonnées dans les copies sauvegardées"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:148
 msgid "Save metadata in &OPF file"
 msgstr "Sauvegarder les métadonnées dans le fichier &OPF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:149
 msgid "Convert non-English characters to &English equivalents"
 msgstr "Convertir les caractères non-Anglais vers des équivalents &Anglais"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:150
 msgid "Format &dates as:"
 msgstr "Format de &dates comme:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:151
 msgid "File &formats to save:"
 msgstr "&Formats de fichier à sauvegarder:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:152
 msgid "Replace space with &underscores"
 msgstr "Remplacer les espaces par des &underscores"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:153
 msgid "Change paths to &lowercase"
 msgstr "Changer les chemins en minuscu&les"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:154
 msgid "&Saving books"
 msgstr "&Sauvegarde de livres"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:135
-msgid "Preserve device collections."
-msgstr "Conserver les collections de l'appareil"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:155
+msgid "Metadata &management:"
+msgstr "Métadonnée &management"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:156
+msgid "Manual management"
+msgstr "Gestion manuelle"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:157
+msgid "Only on send"
+msgstr "Seulement en envoyant"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:158
+msgid "Automatic management"
+msgstr "Gestion automatique"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:159
 msgid ""
-"If checked, collections will not be deleted even if a book with changed "
-"metadata is resent and the collection is not in the book's metadata. In "
-"addition, editing collections in the device view will be enabled. If "
-"unchecked, collections will be always reflect only the metadata in the "
-"calibre library."
+"<li><b>Manual Management</b>: Calibre updates the metadata and adds "
+"collections only when a book is sent. With this option, calibre will never "
+"remove a collection.</li>\n"
+"<li><b>Only on send</b>: Calibre updates metadata and adds/removes "
+"collections for a book only when it is sent to the device. </li>\n"
+"<li><b>Automatic management</b>: Calibre automatically keeps metadata on the "
+"device in sync with the calibre library, on every connect</li></ul>"
 msgstr ""
-"Si cette case est cochée, les collections ne seront pas effacées même si un "
-"livre avec des métadonnées modifiées est renvoyé et la collection n'est pas "
-"dans les métadonnées du livre. En plus, l'édition des collections sur "
-"l'appareil va être activée. Si elle est décochée, les collections seront "
-"seulement le reflet des métadonnées de la bibliothèque de Calibre."
+"<li><b>Gestion manuelle</b>: Calibre met à jour les métadonnée et ajoute des "
+"collections uniquement quand un livre est envoyé.  Avec cette option, "
+"calibre ne supprimera jamais une collection.</li>\n"
+"<li><b>Seulement en envoyant</b>: Calibre met à jour la métadonnée et "
+"ajoute/supprime des collections pour un livre uniquement si elle est envoyée "
+"à un appareil.</li>\n"
+"<li><b>Gestion automatique</b>: Calibre synchronise automatiquement les "
+"métadonnées sur l’appareil avec celle de la bibliothèque de calibre chaque "
+"fois que l'appareil est connecté."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:137
-msgid "  "
-msgstr "  "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:162
 msgid ""
 "Here you can control how calibre will save your books when you click the "
 "Send to Device button. This setting can be overriden for individual devices "
@@ -5751,18 +5830,19 @@ msgstr ""
 "peuvent être outrepassés par votre lecteur en personnalisant l'interface de "
 "gestion des pluggins des lecteurs dans Préférences->Plugins"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:163
 msgid "Sending to &device"
 msgstr "Envoi vers l'&appareil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:167
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:174
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr "Préférences"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
@@ -5770,31 +5850,31 @@ msgstr ""
 "&Localisation des ebooks (Les ebooks sont stockés dans les dossiers triés "
 "par auteur et les métadonnées sont stockées dans le fichier metadata.db)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
 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/config_ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
 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/config_ui.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
 msgid "Download &social metadata (tags/ratings/etc.) by default"
 msgstr ""
 "Télécharger les métadonnées &sociales (étiquettes/classement/etc...) par "
 "défaut"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
 msgid "&Overwrite author and title by default when fetching metadata"
 msgstr ""
 "Écraser l'auteur et le titre par défaut l&ors de la récupération des "
 "métadonnées"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
 msgid "Default network &timeout:"
 msgstr "&Timeout par défaut pour les connexions réseau :"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
@@ -5802,160 +5882,164 @@ msgstr ""
 "Indiquer le timeout  par défaut pour les recherches réseau (c-à-d le temps "
 "utilisé pour aller rechercher l'information par internet)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
 msgid " seconds"
 msgstr " secondes"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
 msgid "Choose &language (requires restart):"
 msgstr "Choisir la &langue (nécessite un redémarrage):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
 msgid "Normal"
 msgstr "Normale"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
 msgid "High"
 msgstr "Haute"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
 msgid "Low"
 msgstr "Basse"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
 msgid "Job &priority:"
 msgstr "&Priorité du travail:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
 msgid "Preferred &output format:"
 msgstr "Format de &sortie préféré:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
 msgid "Preferred &input format order:"
 msgstr "Ordre préféré pour le format d'&entrée"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
 msgid "Use &Roman numerals for series number"
 msgstr "Utiliser les chiffres &romains pour les numéros de séries"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 "&Activer l'affichage dans la zone de notification (redémarrage nécessaire)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
 msgid "Show &notifications in system tray"
 msgstr "Afficher les alertes dans la zone de &notification"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
 msgid "Show &splash screen at startup"
 msgstr "Afficher l'&écran d'accueil au démarrage"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 "Afficher la &navigation par couverture dans une fenêtre séparée (redémarrage "
 "nécessaire)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
 msgid "Show &average ratings in the tags browser"
 msgstr "Afficher la note moyenne dans le navigateur d'étiquettes"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
 msgid "Search as you type"
 msgstr "Rechercher lors de la saisie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr "Envoyer automatiquement les i&nformations vers le lecteur d'ebook"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
 msgid "&Delete news from library when it is automatically sent to reader"
 msgstr ""
 "&Supprimer les News de la bibliothèque lorsque l'envoi est automatique vers "
 "l'appareil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 "&Nombre de couvertures à afficher dans le mode navigation (nécessite un "
 "redémarrage):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
 msgid "Toolbar"
 msgstr "Barre d'outils"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
 msgid "Large"
 msgstr "Large"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
 msgid "Medium"
 msgstr "Moyen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
 msgid "Small"
 msgstr "Petit"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
 msgid "&Button size in toolbar"
 msgstr "Taille des &boutons dans la barre d'outils"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
 msgid "Show &text in toolbar buttons"
 msgstr "Afficher le &texte pour les boutons de la barre d'outils"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
 msgid "Select visible &columns in library view"
 msgstr "Sélectionner les &colonnes visibles dans la vue bibliothèque"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
 msgid "Remove a user-defined column"
 msgstr "Supprimer une colonne définie par l'utilisateur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
 msgid "Add a user-defined column"
 msgstr "Ajouter une colonne définie par l'utilisateur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
 msgid "Edit settings of a user-defined column"
 msgstr "Editer les paramètres d'une colonne définie par l'utilisateur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
 msgid "Use internal &viewer for:"
 msgstr "Utiliser l'&afficheur interne pour:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
 msgid "User Interface &layout (needs restart):"
 msgstr "Présentation de &l'interface utilisateur (nécessite un redémarrage):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 "Désactiver toutes les animations. Utile si vous avez un vieil ordinateur ou "
 "un ordinateur lent"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
 msgid "Disable &animations"
 msgstr "Désactiver les &animations"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
+msgid "Show &donate button (restart)"
+msgstr "Afficher le boutton de"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
 msgid "Add an email address to which to send books"
 msgstr "Ajouter une adresse email où les livres seront envoyés"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
 msgid "&Add email"
 msgstr "&Ajouter un email"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
 msgid "Make &default"
 msgstr "Par &défaut"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
 msgid "&Remove email"
 msgstr "&Supprimer un email"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
 msgid ""
 "calibre can send your books to you (or your reader) by email. Emails will be "
 "automatically sent for downloaded news to all email addresses that have Auto-"
@@ -5965,35 +6049,35 @@ msgstr ""
 "emails seront automatiquement envoyés lors du téléchargement des News à "
 "toutes les adresses qui ont 'Envoyer automatiquement' coché."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
 msgid "&Maximum number of waiting worker processes (needs restart):"
 msgstr ""
 "Nombre &maximum de processus de travail en attente (nécessite un "
 "redémarrage):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
 msgid "&Check database integrity"
 msgstr "Vérifier l'&intégrité de la base de données"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
 msgid "&Install command line tools"
 msgstr "&Installer les outils en ligne de commande"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
 msgid "Open calibre &configuration directory"
 msgstr "Ouvrir le répertoire de &configuration de Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
 msgid "Limit the max. simultaneous jobs to the available CPU &cores"
 msgstr ""
 "Limiter le nombre max de travaux simultanés au nombre de &cœurs de "
 "processeurs disponibles"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
 msgid "Debug &device detection"
 msgstr "Déboguer la &détection de l'appareil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
 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 "
@@ -6004,25 +6088,25 @@ msgstr ""
 "endroit dans le monde. Toute modification des paramètres ne prendra effet "
 "qu'après un redémarrage du serveur."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
 msgid "Server &port:"
 msgstr "&Port du serveur:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:212
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:117
 msgid "&Username:"
 msgstr "Nom d'&utilisateur:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:213
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:119
 msgid "&Password:"
 msgstr "Mot de &passe :"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
@@ -6030,7 +6114,7 @@ msgstr ""
 "Si vous laisser le mot de passe à vide, tout le monde pourra accéder à votre "
 "collection de livres en utilisant une interface web."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
@@ -6038,45 +6122,45 @@ msgstr ""
 "Taille maximale (largeurxhauteur) pour l'affichage des couvertures. Les "
 "couvertures plus larges sont redimensionnées. "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
 msgid "Max. &cover size:"
 msgstr "Taille max. de la &couverture:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:621
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:214
 msgid "&Show password"
 msgstr "&Montrer le mot de passe"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
 msgid "Max. &OPDS items per query:"
 msgstr "Nombre d'articles &OPDS max. par requête:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
 msgid "Max. OPDS &ungrouped items:"
 msgstr "Nombre max. d'articles OPDS &non groupés:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
 msgid "&Start Server"
 msgstr "Démarrer le &Serveur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:621
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
 msgid "St&op Server"
 msgstr "Arrêter le S&erveur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:626
 msgid "&Test Server"
 msgstr "&Tester le serveur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
 msgid "Run server &automatically on startup"
 msgstr "Lancer &automatiquement le serveur au démarrage"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:628
 msgid "View &server logs"
 msgstr "Afficher les logs du &serveur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:46
 msgid ""
 "<p>Remember to leave calibre running as the server only runs as long as "
@@ -6093,7 +6177,7 @@ msgstr ""
 "Stanza de votre iPhone. Ici nomhote doit être le nom d'hôte complet ou "
 "l'adresse IP de l'ordinateur sur lequel Calibre est démarré."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:631
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
@@ -6101,27 +6185,27 @@ msgstr ""
 "Ici vous pouvez personnaliser le comportement de Calibre en choisissant les "
 "plugins que vous souhaitez utiliser."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:628
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:632
 msgid "Enable/&Disable plugin"
 msgstr "Activer/&Désactiver le plugin"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:633
 msgid "&Customize plugin"
 msgstr "&Personnaliser le plugin"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:630
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:634
 msgid "&Remove plugin"
 msgstr "Supp&rimer le plugin"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:635
 msgid "Add new plugin"
 msgstr "Ajouter un nouveau plugin"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:632
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:636
 msgid "Plugin &file:"
 msgstr "&Fichier plugin:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:634
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:638
 msgid "&Add"
 msgstr "&Ajouter"
 
@@ -6159,9 +6243,9 @@ msgstr "Nombre"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:31
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:884
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:889
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Date"
 msgstr "Date"
@@ -6379,12 +6463,20 @@ msgstr "&Afficher cet avertissement de nouveau"
 msgid "ERROR"
 msgstr "ERREUR"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:67
+msgid ""
+"All checked books will be <b>permanently deleted</b> from your device. "
+"Please verify the list."
+msgstr ""
+"Tous les livres sélectionnés vont être <b>supprimés définitivement</b> de "
+"votre appareil.  Veuillez vérifier vos sélections."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 msgid "Location"
 msgstr "Emplacement"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1058
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1064
 msgid "Format"
 msgstr "Format"
 
@@ -7253,6 +7345,10 @@ msgid "Add tag to available tags and apply it to current book"
 msgstr ""
 "Ajoute l'étiquette à la liste des étiquettes et l'applique au livre en cours"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:20
+msgid "%s (was %s)"
+msgstr "%s (autrefois %s)"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:501
 msgid "Item is blank"
@@ -7584,11 +7680,11 @@ msgstr "Expression régulière (?P&lt;title&gt;)"
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:88
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:93
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:98
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:100
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:99
 msgid "No match"
 msgstr "Pas de correspondance"
 
@@ -7628,43 +7724,43 @@ msgstr "Expression régulière (?P<isbn>)"
 msgid "Save single format to disk..."
 msgstr "Sauvegarder un seul format vers le disque..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:53
 msgid "Edit metadata individually"
 msgstr "Editer les métadonnées individuellement"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:56
 msgid "Edit metadata in bulk"
 msgstr "Editer les métadonnées par lot"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:59
 msgid "Download metadata and covers"
 msgstr "Télécharger les métadonnées et les couvertures"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:62
 msgid "Download only metadata"
 msgstr "Télécharger seulement les métadonnées"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:64
 msgid "Download only covers"
 msgstr "Télécharger seulement les couvertures"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:67
 msgid "Download only social metadata"
 msgstr "Télécharger uniquement les métadonnées sociales"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:73
 msgid "Merge into first selected book - delete others"
 msgstr "Fusionner dans le premier livre sélectionné - supprimer les autres"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:76
 msgid "Merge into first selected book - keep others"
 msgstr "Fusionner dans le premier livre sélectionné - conserver les autres"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:84
 msgid "Add books from a single directory"
 msgstr "Ajouter des livres à partir d'un répertoire"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:86
 msgid ""
 "Add books from directories, including sub-directories (One book per "
 "directory, assumes every ebook file is the same book in a different format)"
@@ -7672,7 +7768,7 @@ msgstr ""
 "Ajouter des livres par répertoires et sous-répertoires. (Un livre par "
 "répertoire, chaque fichier représente le même livre dans un format différent)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:90
 msgid ""
 "Add books from directories, including sub directories (Multiple books per "
 "directory, assumes every ebook file is a different book)"
@@ -7680,100 +7776,118 @@ msgstr ""
 "Ajouter des livres par répertoires et sous-répertoires. (Plusieurs livres "
 "par répertoire, chaque fichier est un livre différent)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:93
 msgid "Add Empty book. (Book entry with no formats)"
 msgstr "Ajouter un livre vide. (Une entrée sans aucun format)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:102
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:160
 msgid "Save to disk"
 msgstr "Sauvegarder sur le disque"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Save to disk in a single directory"
 msgstr "Sauvegarder sur le disque dans un seul répertoire"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:106
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:402
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:393
 msgid "Save only %s format to disk"
 msgstr "Sauvegarder seulement le format %s vers le disque"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:110
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:396
 msgid "Save only %s format to disk in a single directory"
 msgstr ""
 "Sauvegarder seulement le format %s sur le disque dans un repertoire unique"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:119
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:166
 msgid "View"
 msgstr "Visualiser"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:121
 msgid "View specific format"
 msgstr "Visualiser le format spécifique"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:127
 msgid "Remove selected books"
 msgstr "Supprimer les livres sélectionnés"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:129
 msgid "Remove files of a specific format from selected books.."
 msgstr ""
 "Supprimer les fichiers d'un format spécifique pour les livres sélectionnés..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:132
 msgid "Remove all formats from selected books, except..."
 msgstr "Supprimer tous les formats pour les livres sélectionnés, excepté..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:135
 msgid "Remove covers from selected books"
 msgstr "Supprimer les couvertures des livres sélectionnés"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:138
 msgid "Remove matching books from device"
 msgstr "Supprimer les livres correspondant de l'appareil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:155
 msgid "Convert individually"
 msgstr "Convertir individuellement"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:157
 msgid "Bulk convert"
 msgstr "Convertir par lot"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:161
 msgid "Create catalog of books in your calibre library"
 msgstr "Créer le catalogue des livres dans votre bibliothèque Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:169
 msgid "Run welcome wizard"
 msgstr "Démarrer l'assistant de bienvenue"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:191
 msgid "Similar books..."
 msgstr "Livres similaires..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:223
 msgid "Add books to library"
 msgstr "Ajouter des livres à la bibliothèque"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:234
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:241
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:239
 msgid "Manage collections"
 msgstr "Gérer les collections"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:328
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:319
 msgid "Cover Browser"
 msgstr "Navigateur de couvertures"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:337
 msgid "Tag Browser"
 msgstr "Navigateur d'étiquettes"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:358
+msgid "version"
+msgstr "version"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:359
+msgid "created by Kovid Goyal"
+msgstr "créé par Kovid Goyal"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:377
+msgid "Connected "
+msgstr "Connecté: "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:386
+msgid "Update found"
+msgstr "Mise à jour trouvée"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:430
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:439
 msgid "Book Details"
 msgstr "Détails du livre"
 
@@ -7837,6 +7951,235 @@ msgstr "Cliquer pour voir la liste des travaux actifs."
 msgid " - Jobs"
 msgstr " - Travaux"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:64
+msgid ""
+"Library\n"
+"%d books"
+msgstr ""
+"Bibliothèque\n"
+"%d livres"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:65
+msgid ""
+"Reader\n"
+"%s"
+msgstr ""
+"Lecteur\n"
+"%s"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:66
+msgid ""
+"Card A\n"
+"%s"
+msgstr ""
+"Carte mémoire A\n"
+"%s"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:67
+msgid ""
+"Card B\n"
+"%s"
+msgstr ""
+"Carte mémoire B\n"
+"%s"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:71
+msgid "Click to see the books available on your computer"
+msgstr "Cliquer pour voir les livres disponibles sur votre ordinateur"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:74
+msgid "Click to see the books in the main memory of your reader"
+msgstr ""
+"Cliquer pour voir les livres dans la mémoire principale de votre lecteur"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:75
+msgid "Click to see the books on storage card A in your reader"
+msgstr ""
+"Cliquer pour voir les livres dans la carte mémoire A de votre lecteur"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:76
+msgid "Click to see the books on storage card B in your reader"
+msgstr ""
+"Cliquer pour voir les livres dans la carte mémoire B de votre lecteur"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:84
+msgid "Books located at"
+msgstr "Livres situés à"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:100
+msgid "free"
+msgstr "libre"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:134
+msgid ""
+"Books display will be restricted to those matching the selected saved search"
+msgstr ""
+"Les livres affichés seront limités à ceux correspondant à la recherche "
+"sauvegardée sélectionnée"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:136
+msgid "Advanced search"
+msgstr "Recherche avancée"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:141
+msgid ""
+"<p>Search the list of books by title, author, publisher, tags, comments, "
+"etc.<br><br>Words separated by spaces are ANDed"
+msgstr ""
+"<p>Recherche la liste des livres par titre, auteur, éditeur, étiquettes, "
+"commentaires, etc...<br><br>Les mots séparés par des espaces sont traités "
+"avec des AND"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:142
+msgid "Reset Quick Search"
+msgstr "Réinitialisation de la recherche rapide"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:328
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:144
+msgid "Copy current search text (instead of search name)"
+msgstr ""
+"Copier le texte de recherche courant (au lieu du nom de la recherche)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:146
+msgid "Save current search under the name shown in the box"
+msgstr "Sauvegarder la recherche courante avec le nom indiqué dans la boite"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:148
+msgid "Delete current saved search"
+msgstr "Supprimer la recherche sauvegardée actuelle"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:150
+msgid "Add books"
+msgstr "Ajouter des livres"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:151
+msgid "A"
+msgstr "A"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:153
+msgid "Remove books"
+msgstr "Supprimer des livres"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:154
+msgid "Del"
+msgstr "Suppression"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:406
+msgid "Edit meta info"
+msgstr "Éditer métadonnée"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:406
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:156
+msgid "E"
+msgstr "E"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:157
+msgid "Merge book records"
+msgstr "Fusionner les enregistrements de livres"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:158
+msgid "M"
+msgstr "M"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:159
+msgid "Send to device"
+msgstr "Envoyer au lecteur"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:161
+msgid "S"
+msgstr "S"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:162
+msgid "Fetch news"
+msgstr "Récupérer des News"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:163
+msgid "F"
+msgstr "F"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:164
+msgid "Convert books"
+msgstr "Convertir les livres"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:165
+msgid "C"
+msgstr "C"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:167
+msgid "V"
+msgstr "V"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:168
+msgid "Open containing folder"
+msgstr "Ouvrir le dossier contenant"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:169
+msgid "Show book details"
+msgstr "Afficher les détails du livre"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:170
+msgid "Books by same author"
+msgstr "Livres du même auteur"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:171
+msgid "Books in this series"
+msgstr "Livres dans cette série"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:172
+msgid "Books by this publisher"
+msgstr "Livres de cet éditeur"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:173
+msgid "Books with the same tags"
+msgstr "Livres avec les mêmes étiquettes"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:176
+msgid "Ctrl+P"
+msgstr "Ctrl+P"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:177
+msgid "Help"
+msgstr "Aide"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:178
+msgid "Browse the calibre User Manual"
+msgstr "Parcourir le manuel utilisateur de Calibre"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:179
+msgid "F1"
+msgstr "F1"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:284
 msgid "N"
 msgstr "N"
@@ -7858,29 +8201,29 @@ msgid "Rating"
 msgstr "Note"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:324
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1084
 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/models.py:674
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1176
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1182
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
 msgid "The lookup/search name is \"{0}\""
 msgstr "Le nom recherché/consulté est \"{0}\""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:886
 msgid "In Library"
 msgstr "Dans la bibliothèque"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:885
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:890
 msgid "Size"
 msgstr "Taille"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1156
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1162
 msgid "Marked for deletion"
 msgstr "Marqué pour suppression"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1165
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr "Double clic pour m' <b>éditer</b><br><br>"
 
@@ -7924,11 +8267,11 @@ msgstr "Afficher la colonne"
 msgid "Restore default layout"
 msgstr "Restorer l'affichage par défaut"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:524
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:525
 msgid "Not allowed"
 msgstr "Interdit"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:526
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
@@ -8139,163 +8482,34 @@ msgstr "Essayer de redémarrer l'ordinateur."
 msgid "try deleting the file"
 msgstr "Essayer de supprimer le fichier"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:131
 msgid "calibre"
 msgstr "Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:133
 msgid "&Restrict to:"
 msgstr "&Limiter à:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
-msgid ""
-"Books display will be restricted to those matching the selected saved search"
-msgstr ""
-"Les livres affichés seront limités à ceux correspondant à la recherche "
-"sauvegardée sélectionnée"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:135
 msgid "set in ui.py"
 msgstr "indiquer dans ui.py"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
-msgid "Advanced search"
-msgstr "Recherche avancée"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:138
 msgid "Alt+S"
 msgstr "Alt+S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:139
 msgid "&Search:"
 msgstr "&Recherche :"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
-msgid ""
-"<p>Search the list of books by title, author, publisher, tags, comments, "
-"etc.<br><br>Words separated by spaces are ANDed"
-msgstr ""
-"<p>Recherche la liste des livres par titre, auteur, éditeur, étiquettes, "
-"commentaires, etc...<br><br>Les mots séparés par des espaces sont traités "
-"avec des AND"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
-msgid "Reset Quick Search"
-msgstr "Réinitialisation de la recherche rapide"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
-msgid "Choose saved search or enter name for new saved search"
-msgstr ""
-"Choisir la recherche sauvegardée ou entrer un nom pour une nouvelle "
-"recherche à sauvegarder"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
-msgid "Copy current search text (instead of search name)"
-msgstr ""
-"Copier le texte de recherche courant (au lieu du nom de la recherche)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
-msgid "Save current search under the name shown in the box"
-msgstr "Sauvegarder la recherche courante avec le nom indiqué dans la boite"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
-msgid "Delete current saved search"
-msgstr "Supprimer la recherche sauvegardée actuelle"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
-msgid "Add books"
-msgstr "Ajouter des livres"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
-msgid "A"
-msgstr "A"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
-msgid "Remove books"
-msgstr "Supprimer des livres"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
-msgid "Del"
-msgstr "Suppression"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:155
 msgid "Edit meta information"
 msgstr "Editer les métadonnées"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
-msgid "E"
-msgstr "E"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
-msgid "Merge book records"
-msgstr "Fusionner les enregistrements de livres"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
-msgid "M"
-msgstr "M"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
-msgid "Send to device"
-msgstr "Envoyer au lecteur"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
-msgid "S"
-msgstr "S"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
-msgid "Fetch news"
-msgstr "Récupérer des News"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
-msgid "F"
-msgstr "F"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
-msgid "Convert E-books"
-msgstr "Convertir des ebooks"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
-msgid "C"
-msgstr "C"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
-msgid "V"
-msgstr "V"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
-msgid "Open containing folder"
-msgstr "Ouvrir le dossier contenant"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
-msgid "Show book details"
-msgstr "Afficher les détails du livre"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
-msgid "Books by same author"
-msgstr "Livres du même auteur"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
-msgid "Books in this series"
-msgstr "Livres dans cette série"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
-msgid "Books by this publisher"
-msgstr "Livres de cet éditeur"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
-msgid "Books with the same tags"
-msgstr "Livres avec les mêmes étiquettes"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:175
 msgid "Configure calibre"
 msgstr "Configurer Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
-msgid "Ctrl+P"
-msgstr "Ctrl+P"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:20
 msgid ""
 "Redirect console output to a dialog window (both stdout and stderr). Useful "
@@ -8325,35 +8539,46 @@ msgstr "Le livre n'a ni titre ni ISBN"
 msgid "No matches found for this book"
 msgstr "Aucune correspondance pour ce livre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:91
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:553
 msgid "Search"
 msgstr "Trouver"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:313
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:315
 msgid "The selected search will be <b>permanently deleted</b>. Are you sure?"
 msgstr ""
 "La recherche sélectionnée sera  <b>définitivement effacée</b>. Êtes-vous sûr "
 "de vouloir continuer?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:357
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr ""
 "Recherche (pour une recherche avancée cliquer sur le bouton à gauche)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:392
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:398
 msgid "Saved Searches"
 msgstr "Recherches sauvegardées"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:406
+msgid "Choose saved search or enter name for new saved search"
+msgstr ""
+"Choisir la recherche sauvegardée ou entrer un nom pour une nouvelle "
+"recherche à sauvegarder"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:10
+msgid "Restrict to"
+msgstr "Limiter à"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:48
 msgid "({0} of {1})"
 msgstr "({0} de {1})"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
 msgid "(all books)"
 msgstr "(tous les livres)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:56
 msgid "({0} of all)"
 msgstr "({0} de tout)"
 
@@ -8476,18 +8701,33 @@ msgstr "Trier par popularité"
 msgid "Sort by average rating"
 msgstr "Trier par note moyenne"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:775
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:772
+msgid "Set the sort order for entries in the Tag Browser"
+msgstr "Définir l'ordre de tri des entrées dans le navigateur d'étiquettes"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:778
 msgid "Match all"
 msgstr "Toutes les correspondances"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:775
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:778
 msgid "Match any"
 msgstr "Aucune correspondance"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:783
+msgid ""
+"When selecting multiple entries in the Tag Browser match any or all of them"
+msgstr ""
+"Quand de multiples entrées sont sélectionnées dans le navigateur "
+"d'étiquettes, fait correspondre à tout ou partie de celles-ci"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:787
 msgid "Manage &user categories"
 msgstr "Gérer les catégories de l'&utilisateur"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:790
+msgid "Add your own categories to the Tag Browser"
+msgstr "Ajouter vos propres catégories au navigateur d'étiquettes"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182
 msgid "Convert book %d of %d (%s)"
@@ -8515,15 +8755,15 @@ msgstr "Mise en file d'attente des livres pour la conversion par lot"
 msgid "Queueing "
 msgstr "Mise en file d'attente "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:239
 msgid "Fetch news from "
 msgstr "Récupérer des News de "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:301
 msgid "Convert existing"
 msgstr "Conversion existante"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:302
 msgid ""
 "The following books have already been converted to %s format. Do you wish to "
 "reconvert them?"
@@ -8539,55 +8779,46 @@ msgstr "&Montrer"
 msgid "&Donate to support calibre"
 msgstr "&Donner pour supporter Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:168
 msgid "&Eject connected device"
 msgstr "&Ejecter l'appareil connecté"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:173
 msgid "&Restart"
 msgstr "&Redémarrer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:206
-msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
-msgstr ""
-"<p>Pour l'aide, consulter le <a href=\"%s\">Manuel Utilisateur</a><br>"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:212
-msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
-msgstr "<b>%s</b>: %s par <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:227
 msgid "Calibre Quick Start Guide"
 msgstr "Guide De Démarrage Rapide Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:389
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:380
 msgid "Cannot configure"
 msgstr "Configuration impossible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:376
 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/ui.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:381
 msgid "Cannot configure before calibre is restarted."
 msgstr "Configuration impossible avant que Calibre n'ait été redémarré."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:424
 msgid "No detailed info available"
 msgstr "Pas d'information détaillée disponible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:425
 msgid "No detailed information is available for books on the device."
 msgstr ""
 "Pas d'information détaillée disponible pour les livres dans l'appareil."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:486
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr "Erreur lors de la conversion"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:487
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:478
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using third party tools."
@@ -8596,28 +8827,29 @@ msgstr ""
 "href=\"%s\">DRM</a>. Vous devez d'abord enlever les DRM avec des outils "
 "tiers."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:491
 msgid "Recipe Disabled"
 msgstr "Recette désactivée"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:506
 msgid "<b>Failed</b>"
 msgstr "<b>Échoué</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:546
 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."
+"you find it useful, please consider donating to support its development. "
+"Your donation helps keep calibre development going."
 msgstr ""
-"est le résultat d'efforts de beaucoup de volontaires partout dans le monde. "
-"Si vous le trouvez utile, pensez à donner afin de supporter son "
-"développement."
+"est le résultat des efforts de multiples volontaires bénévoles partout dans "
+"le monde. Si vous le trouvez utile, vous pouvez donner pour soutenir son "
+"développement. Vos donations aident Calibre à continuer à se développer."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:572
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr "Il y a des travaux actifs. Voulez-vous vraiment finir ?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:575
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
@@ -8628,11 +8860,11 @@ msgstr ""
 "l'appareil.<br>\n"
 "                      Êtes-vous sûr de vouloir quitter ?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:579
 msgid "WARNING: Active jobs"
 msgstr "ATTENTION: Travaux actifs"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:640
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:632
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -8640,19 +8872,11 @@ msgstr ""
 "continuera à tourner dans la zone de notification. Pour le fermer, choisir "
 "<b>Quitter</b> dans le menu contextuel de la zone de notification."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/update.py:52
-msgid ""
-"<span style=\"color:red; font-weight:bold\">Latest version: <a "
-"href=\"%s\">%s</a></span>"
-msgstr ""
-"<span style=\"color:red; font-weight:bold\">Dernière version: <a "
-"href=\"%s\">%s</a></span>"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/update.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:56
 msgid "Update available"
 msgstr "Mise à jour disponible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/update.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:57
 msgid ""
 "%s has been updated to version %s. See the <a href=\"http://calibre-"
 "ebook.com/whats-new\">new features</a>. Visit the download page?"
@@ -9138,106 +9362,43 @@ msgstr "Maj+F3"
 msgid "Print eBook"
 msgstr "Imprimer un ebook"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
 msgid "Copy Image"
 msgstr "Copier l'image"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:240
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:239
 msgid "Paste Image"
 msgstr "Coller l'image"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:270
-msgid ""
-"Library\n"
-"%d\n"
-"books"
-msgstr ""
-"Bibliothèque\n"
-"%d\n"
-"Livres"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:271
-msgid ""
-"Reader\n"
-"%s\n"
-"available"
-msgstr ""
-"Lecteur\n"
-"%s\n"
-"disponible"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:272
-msgid ""
-"Card A\n"
-"%s\n"
-"available"
-msgstr ""
-"Carte A\n"
-"%s\n"
-"disponible"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:273
-msgid ""
-"Card B\n"
-"%s\n"
-"available"
-msgstr ""
-"Carte B\n"
-"%s\n"
-"disponible"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:277
-msgid "Click to see the books available on your computer"
-msgstr "Cliquer pour voir les livres disponibles sur votre ordinateur"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:280
-msgid "Click to see the books in the main memory of your reader"
-msgstr ""
-"Cliquer pour voir les livres dans la mémoire principale de votre lecteur"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:281
-msgid "Click to see the books on storage card A in your reader"
-msgstr ""
-"Cliquer pour voir les livres dans la carte mémoire A de votre lecteur"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:282
-msgid "Click to see the books on storage card B in your reader"
-msgstr ""
-"Cliquer pour voir les livres dans la carte mémoire B de votre lecteur"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:290
-msgid "Books located at"
-msgstr "Livres situés à"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:364
 msgid "Change Case"
 msgstr "Modifier la casse"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:365
 msgid "Upper Case"
 msgstr "Majuscule"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:366
 msgid "Lower Case"
 msgstr "Minuscule"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:367
 msgid "Swap Case"
 msgstr "Basculer la casse"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:368
 msgid "Title Case"
 msgstr "Casse du titre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:974
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:837
 msgid "Drag to resize"
 msgstr "Faire glisser pour redimensionner"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:869
 msgid "Show"
 msgstr "Afficher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1012
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:876
 msgid "Hide"
 msgstr "Masquer"
 
@@ -10621,10 +10782,8 @@ msgid "User-created tag browser categories"
 msgstr "Catégories définies par l'utilisateur du navigateur d'étiquettes"
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:702
-msgid "Preserve all collections even if not in library metadata."
-msgstr ""
-"Conserver toutes les collections même si elles ne font pas parti des "
-"métadonnées de la bibliothèque"
+msgid "How and when calibre updates metadata on the device."
+msgstr "Comment et quand calibre met à jour la métadonné sur l'appareil."
 
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:43
 msgid "Waiting..."
@@ -10798,86 +10957,86 @@ msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 "La recette \"%s\" a besoin d'un nom d'utilisateur et d'un mot de passe."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:706
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:708
 msgid "Download finished"
 msgstr "Téléchargement effectué"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:708
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:710
 msgid "Failed to download the following articles:"
 msgstr "Impossible de télécharger les articles suivants;"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:714
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:716
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 "Impossible de télécharger certaines parties pour les articles suivants:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:716
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:718
 msgid " from "
 msgstr " de "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:718
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:720
 msgid "\tFailed links:"
 msgstr "\tLiens qui ont échoués:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:807
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:809
 msgid "Could not fetch article. Run with -vv to see the reason"
 msgstr ""
 "Impossible de récupérer l'article. Le lancer avec -w pour en connaitre la "
 "raison"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:828
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:830
 msgid "Fetching feeds..."
 msgstr "Récupération des flux..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:833
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:835
 msgid "Got feeds from index page"
 msgstr "Obtient les flux à partir de la page d'index"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:839
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:841
 msgid "Trying to download cover..."
 msgstr "Essaie de télécharger la couverture..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:841
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Generating masthead..."
 msgstr "Génération du masthead"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:922
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:924
 msgid "Starting download [%d thread(s)]..."
 msgstr "Commence le téléchargement [processus %d]..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:938
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:940
 msgid "Feeds downloaded to %s"
 msgstr "Flux téléchargés de %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:948
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:950
 msgid "Could not download cover: %s"
 msgstr "Impossible de télécharger la couverture: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:960
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
 msgid "Downloading cover from %s"
 msgstr "Télécharge la couverture de %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1002
 msgid "Masthead image downloaded"
 msgstr "L'image du titre a été téléchargée"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1190
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1192
 msgid "Untitled Article"
 msgstr "Article sans titre"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1261
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1263
 msgid "Article downloaded: %s"
 msgstr "Article téléchargé : %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1272
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1274
 msgid "Article download failed: %s"
 msgstr "Impossible de télécharger l'article: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1289
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1291
 msgid "Fetching feed"
 msgstr "Récupération du flux"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1436
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1438
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
@@ -10885,7 +11044,7 @@ msgstr ""
 "La connexion a échouée, vérifier votre nom d'utilisateur et votre mot de "
 "passe pour le service Périodique Calibre."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1452
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1454
 msgid ""
 "You do not have permission to download this issue. Either your subscription "
 "has expired or you have exceeded the maximum allowed downloads for today."
@@ -11283,6 +11442,9 @@ msgstr "Ne pas télécharger les feuilles de style CSS."
 #~ "Recherche les livres par titre, auteur, éditeur, tags et commentaires "
 #~ "<br><br>Recherche en ET pour les mots séparés par des espaces."
 
+#~ msgid "Convert E-books"
+#~ msgstr "Convertir des ebooks"
+
 #~ msgid "Don't add links to the table of contents."
 #~ msgstr "Ne pas ajouter de liens à la table des matières."
 
@@ -11819,6 +11981,9 @@ msgstr "Ne pas télécharger les feuilles de style CSS."
 #~ "<p>Pour l'aide visiter <a "
 #~ "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
 
+#~ msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
+#~ msgstr "<b>%s</b>: %s par <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
+
 #~ msgid ""
 #~ "Control the automatic generation of a Table of Contents. If an OPF file is "
 #~ "detected\n"
@@ -11893,6 +12058,21 @@ msgstr "Ne pas télécharger les feuilles de style CSS."
 #~ msgid "Copying library to "
 #~ msgstr "Copie la librairie vers "
 
+#~ msgid ""
+#~ "<span style=\"color:red; font-weight:bold\">Latest version: <a "
+#~ "href=\"%s\">%s</a></span>"
+#~ msgstr ""
+#~ "<span style=\"color:red; font-weight:bold\">Dernière version: <a "
+#~ "href=\"%s\">%s</a></span>"
+
+#~ 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 ""
+#~ "est le résultat d'efforts de beaucoup de volontaires partout dans le monde. "
+#~ "Si vous le trouvez utile, pensez à donner afin de supporter son "
+#~ "développement."
+
 #~ msgid "Output:"
 #~ msgstr "Sortie:"
 
@@ -11966,6 +12146,15 @@ msgstr "Ne pas télécharger les feuilles de style CSS."
 #~ "Cliquer pour voir la liste des livres présents dans la mémoire principale de "
 #~ "votre lecteur"
 
+#~ msgid ""
+#~ "Reader\n"
+#~ "%s\n"
+#~ "available"
+#~ msgstr ""
+#~ "Lecteur\n"
+#~ "%s\n"
+#~ "disponible"
+
 #~ msgid "Set the title. Default is to autodetect."
 #~ msgstr "Changer le titre. La valeur par défaut est l'autodétection."
 
@@ -13083,6 +13272,24 @@ msgstr "Ne pas télécharger les feuilles de style CSS."
 #~ msgid "Send specific format to storage card A"
 #~ msgstr "Envoyer le format spécifique vers la carte mémoire A"
 
+#~ msgid ""
+#~ "Card A\n"
+#~ "%s\n"
+#~ "available"
+#~ msgstr ""
+#~ "Carte A\n"
+#~ "%s\n"
+#~ "disponible"
+
+#~ msgid ""
+#~ "Card B\n"
+#~ "%s\n"
+#~ "available"
+#~ msgstr ""
+#~ "Carte B\n"
+#~ "%s\n"
+#~ "disponible"
+
 #~ msgid ""
 #~ "<h2>Demo videos</h2>Videos demonstrating the various features of calibre are "
 #~ "available <a "
@@ -13305,6 +13512,10 @@ msgstr "Ne pas télécharger les feuilles de style CSS."
 #~ msgid "Masthead font:"
 #~ msgstr "Police masthead"
 
+#~ msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
+#~ msgstr ""
+#~ "<p>Pour l'aide, consulter le <a href=\"%s\">Manuel Utilisateur</a><br>"
+
 #~ msgid ""
 #~ "If an existing book with a similar title and author is found that does not "
 #~ "have the format being added, the format is added \n"
@@ -13411,6 +13622,15 @@ msgstr "Ne pas télécharger les feuilles de style CSS."
 #~ msgid "Cover browser could not be loaded: "
 #~ msgstr "Le navigateur de couverture ne peut pas être chargé: "
 
+#~ msgid ""
+#~ "Library\n"
+#~ "%d\n"
+#~ "books"
+#~ msgstr ""
+#~ "Bibliothèque\n"
+#~ "%d\n"
+#~ "Livres"
+
 #~ msgid "Manage "
 #~ msgstr "Gérer "
 
@@ -13435,3 +13655,27 @@ msgstr "Ne pas télécharger les feuilles de style CSS."
 
 #~ msgid "Connect to iTunes (EXPERIMENTAL)"
 #~ msgstr "Connecter à iTunes (EXPERIMENTAL)"
+
+#~ msgid "Preserve device collections."
+#~ msgstr "Conserver les collections de l'appareil"
+
+#~ msgid ""
+#~ "If checked, collections will not be deleted even if a book with changed "
+#~ "metadata is resent and the collection is not in the book's metadata. In "
+#~ "addition, editing collections in the device view will be enabled. If "
+#~ "unchecked, collections will be always reflect only the metadata in the "
+#~ "calibre library."
+#~ msgstr ""
+#~ "Si cette case est cochée, les collections ne seront pas effacées même si un "
+#~ "livre avec des métadonnées modifiées est renvoyé et la collection n'est pas "
+#~ "dans les métadonnées du livre. En plus, l'édition des collections sur "
+#~ "l'appareil va être activée. Si elle est décochée, les collections seront "
+#~ "seulement le reflet des métadonnées de la bibliothèque de Calibre."
+
+#~ msgid "  "
+#~ msgstr "  "
+
+#~ msgid "Preserve all collections even if not in library metadata."
+#~ msgstr ""
+#~ "Conserver toutes les collections même si elles ne font pas parti des "
+#~ "métadonnées de la bibliothèque"
diff --git a/src/calibre/translations/gl.po b/src/calibre/translations/gl.po
index 31bdee4b15..c9c8ab28d2 100644
--- a/src/calibre/translations/gl.po
+++ b/src/calibre/translations/gl.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-07-03 01:21+0000\n"
-"PO-Revision-Date: 2010-07-02 18:12+0000\n"
+"POT-Creation-Date: 2010-07-09 22:00+0000\n"
+"PO-Revision-Date: 2010-07-09 20:12+0000\n"
 "Last-Translator: Imendez <ivan.mendez.lopez@gmail.com>\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: 2010-07-03 03:44+0000\n"
+"X-Launchpad-Export-Date: 2010-07-10 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
@@ -27,10 +27,10 @@ msgstr "Non facer nada"
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:71
 #: /home/kovid/work/calibre/src/calibre/devices/prs500/books.py:267
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:466
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:492
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:396
-#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:98
-#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:101
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:97
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:100
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/metadata.py:56
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:428
 #: /home/kovid/work/calibre/src/calibre/ebooks/fb2/input.py:67
@@ -72,9 +72,9 @@ msgstr "Non facer nada"
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:818
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:49
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:51
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:910
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:915
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:981
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:911
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:916
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:982
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:137
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:139
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:108
@@ -102,20 +102,20 @@ msgstr "Non facer nada"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:233
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:290
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:815
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:818
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:814
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:817
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:172
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:179
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:22
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:135
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:903
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:912
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1192
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1195
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:898
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:907
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1190
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1193
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:120
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:155
@@ -123,8 +123,8 @@ msgstr "Non facer nada"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:172
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:362
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:877
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1054
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:882
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1060
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:87
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:92
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:185
@@ -170,7 +170,7 @@ msgstr "Editor de metadatos"
 msgid "Catalog generator"
 msgstr "Xerador de catálogos"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:15
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:16
 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 "
@@ -180,7 +180,7 @@ msgstr ""
 "todos os ficheiros ligados. Este engadido execútase cada vez que se engade "
 "un ficheiro HTML á biblioteca."
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:51
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:52
 msgid ""
 "Character encoding for the input HTML files. Common choices include: cp1252, "
 "latin1, iso-8859-1 and utf-8."
@@ -188,7 +188,7 @@ msgstr ""
 "Codificación de caracteres para os ficheiros HTML de orixe. As opcións "
 "comúns inclúen: cp1252, latin1, iso-8859-1 e utf-8."
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:58
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:59
 msgid ""
 "Create a PMLZ archive containing the PML file and all images in the "
 "directory pmlname_img or images. This plugin is run every time you add a PML "
@@ -198,49 +198,49 @@ msgstr ""
 "cartafol pmlname_img ou imaxes. Este engadido execútase cada vez que engade "
 "un ficheiro PML á biblioteca."
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:90
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:93
 msgid "Extract cover from comic files"
 msgstr "Extrae a portada dos ficheiros de banda deseñada"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:117
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:128
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:140
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:150
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:160
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:171
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:181
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:191
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:201
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:211
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:221
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:232
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:243
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:255
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:276
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:287
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:297
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:307
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:120
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:131
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:153
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:163
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:174
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:184
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:194
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:204
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:214
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:224
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:235
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:246
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:258
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:279
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:290
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:300
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:310
 msgid "Read metadata from %s files"
 msgstr "Ler os metadatos dos ficheiros %s"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:266
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:269
 msgid "Read metadata from ebooks in RAR archives"
 msgstr "Ler os metadatos dos ebooks dentro de arquivos RAR"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:318
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:321
 msgid "Read metadata from ebooks in ZIP archives"
 msgstr "Ler os metadatos dos arquivos ZIP"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:331
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:341
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:351
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:373
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:384
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:394
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:334
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:344
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:354
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:376
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:387
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:397
 msgid "Set metadata in %s files"
 msgstr "Define os metadatos nos ficheiros %s"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:362
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:365
 msgid "Set metadata from %s files"
 msgstr "Define os metadatos desde os ficheiros %s"
 
@@ -399,35 +399,35 @@ msgstr ""
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr "Este perfil é o propio o Amazon Kindle DX."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:31
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
 msgid "Installed plugins"
 msgstr "Engadidos instalados"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:33
 msgid "Mapping for filetype plugins"
 msgstr "Mapeando por engadidos de ficheiro"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:33
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:34
 msgid "Local plugin customization"
 msgstr "Personalización de engadido local"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:34
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
 msgid "Disabled plugins"
 msgstr "Engadidos desactivados"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
 msgid "Enabled plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:83
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:84
 msgid "No valid plugin found in "
 msgstr "Non se acharon engadidos correctos en "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:460
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:468
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr "Fallou o inicio do engadido %s deixando a seguinte traza:"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:493
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
 msgid ""
 "    %prog options\n"
 "\n"
@@ -439,18 +439,18 @@ msgstr ""
 "    Personalice Calibre cargando engadidos externos.\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:499
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr ""
 "Engadir un engadido especificando o camiño ao ficheiro zip que o contén."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 "Eiminar un engadido persoal polo nome. Non afecta aos engadidos incorporados "
 "no programa."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:503
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:511
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
@@ -458,15 +458,15 @@ msgstr ""
 "Personalizar engadido. Especifica o nome do engadido e o texto de "
 "personalización separados por unha coma."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:505
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:513
 msgid "List all installed plugins"
 msgstr "Listar todos os complementos instalados"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Enable the named plugin"
 msgstr "Activar o complemento sinalado"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Disable the named plugin"
 msgstr "Desactivar o complemento sinalado"
 
@@ -622,7 +622,7 @@ msgstr "Comunicar cos lectores Hanlin V5."
 msgid "Communicate with the BOOX eBook reader."
 msgstr "Comunicar co lector BOOX."
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:121
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:123
 msgid ""
 "Comma separated list of directories to send e-books to on the device. The "
 "first one that exists will be used."
@@ -693,7 +693,7 @@ msgstr "Comunicar co Kobo Reader"
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:51
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:54
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:57
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:157
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:159
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:64
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:67
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:70
@@ -703,22 +703,22 @@ msgstr "Comunicar co Kobo Reader"
 msgid "Getting list of books on device..."
 msgstr "Obtendo a lista de libros do dispositivo..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:218
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:258
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:219
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:263
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:244
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:262
 msgid "Removing books from device..."
 msgstr "A eliminar os libros do dispositivo..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:262
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:269
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:267
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:274
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:269
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:274
 msgid "Removing books from device metadata listing..."
 msgstr "Eliminando libros da lista de metatados do dispositivo..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:274
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:308
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:313
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:208
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:238
 msgid "Adding books to device metadata listing..."
@@ -736,6 +736,10 @@ msgstr "Comunicar co Booq Avant"
 msgid "Communicate with the Sweex MM300"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/misc.py:75
+msgid "Communicate with the Pandigital Novel"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:17
 msgid "Communicate with the Nokia 770 internet tablet."
 msgstr "Comunicar coa táboa de internet Nokia 770."
@@ -1649,6 +1653,51 @@ msgstr "Aplicando transformacións ao libro electrónico..."
 msgid "Creating"
 msgstr "A crear"
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/__init__.py:18
+msgid "ePub Fixer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/epubcheck.py:18
+msgid "Workaround epubcheck bugs"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/epubcheck.py:22
+msgid ""
+"Workarounds for bugs in the latest release of epubcheck. epubcheck reports "
+"many things as errors that are not actually errors. %prog will try to detect "
+"these and replace them with constructs that epubcheck likes. This may cause "
+"significant changes to your epub, complain to the epubcheck project."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:19
+msgid ""
+"%prog [options] file.epub\n"
+"\n"
+"Fix common problems in EPUB files that can cause them to be rejected by "
+"poorly designed publishing services.\n"
+"\n"
+"By default, no fixing is done and messages are printed out for each error "
+"detected. Use the options to control which errors are automatically fixed."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:50
+msgid "You must specify an epub file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:17
+msgid "Fix unmanifested files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:21
+msgid ""
+"Fix unmanifested files. %prog can either add them to the manifest or delete "
+"them as specified by the delete unmanifested option."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:32
+msgid "Delete unmanifested files instead of adding them to the manifest"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:56
 msgid ""
 "Extract the contents of the generated EPUB file to the specified directory. "
@@ -2008,11 +2057,11 @@ msgstr "Cómic"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:98
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:882
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:887
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:543
 msgid "Title"
 msgstr "Título"
@@ -2021,7 +2070,7 @@ msgstr "Título"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:364
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:883
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:888
 msgid "Author(s)"
 msgstr "Autores/as"
 
@@ -2044,7 +2093,7 @@ msgstr "Produtor"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:67
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:318
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1073
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1079
 msgid "Comments"
 msgstr "Comentarios"
 
@@ -2053,7 +2102,7 @@ msgstr "Comentarios"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:306
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1069
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1075
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:139
 msgid "Tags"
 msgstr "Etiquetas"
@@ -2063,7 +2112,7 @@ msgstr "Etiquetas"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:323
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1084
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:87
 msgid "Series"
 msgstr "Series"
@@ -2073,7 +2122,7 @@ msgid "Language"
 msgstr "Idioma"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:406
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1067
 msgid "Timestamp"
 msgstr "Marca temporal"
 
@@ -2325,7 +2374,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1226
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1398
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1399
 msgid "Cover"
 msgstr "Capa"
 
@@ -2369,70 +2418,70 @@ msgstr "Todos os artigos"
 msgid "This is an Amazon Topaz book. It cannot be processed."
 msgstr "Este é un libro Topaz de Amazon. Por tanto, non se pode procesar."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1399
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1400
 msgid "Title Page"
 msgstr "Páxina de título"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1400
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1401
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:15
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:53
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:194
 msgid "Table of Contents"
 msgstr "Índice de Contidos"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1401
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1402
 msgid "Index"
 msgstr "Índice"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1402
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1403
 msgid "Glossary"
 msgstr "Glosario"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1403
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1404
 msgid "Acknowledgements"
 msgstr "Agradecementos"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1404
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1405
 msgid "Bibliography"
 msgstr "Bibliografia"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1405
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1406
 msgid "Colophon"
 msgstr "Colofón"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1406
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1407
 msgid "Copyright"
 msgstr "Dereitos de copia"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1407
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1408
 msgid "Dedication"
 msgstr "Dedicatoria"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1408
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1409
 msgid "Epigraph"
 msgstr "Epígrafe"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1409
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1410
 msgid "Foreword"
 msgstr "Prólogo"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1410
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1411
 msgid "List of Illustrations"
 msgstr "Lista de Ilustracións"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1411
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1412
 msgid "List of Tables"
 msgstr "Lista de Táboas"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1412
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1413
 msgid "Notes"
 msgstr "Notas"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1413
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1414
 msgid "Preface"
 msgstr "Prefacio"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1414
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1415
 msgid "Main Text"
 msgstr "Texto Principal"
 
@@ -2479,7 +2528,7 @@ msgstr "Barra lateral"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:22
 #: /home/kovid/work/calibre/src/calibre/ebooks/tcr/input.py:23
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:23
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:24
 msgid ""
 "Normally calibre treats blank lines as paragraph markers. With this option "
 "it will assume that every line represents a paragraph instead."
@@ -2490,7 +2539,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:26
 #: /home/kovid/work/calibre/src/calibre/ebooks/tcr/input.py:27
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:27
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:28
 msgid ""
 "Normally calibre treats blank lines as paragraph markers. With this option "
 "it will assume that every line starting with an indent (either a tab or 2+ "
@@ -2658,7 +2707,7 @@ msgstr ""
 "Obter a información do PDF.\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
 msgid "Author"
 msgstr "Autor"
@@ -2828,7 +2877,7 @@ msgstr ""
 "nivel máis baixo de compresión pero o máis rápido, mentres que 10 é o máis "
 "alto pero o máis lento."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:33
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:34
 msgid ""
 "Normally extra spaces are condensed into a single space. With this option "
 "all spaces will be displayed."
@@ -2836,13 +2885,13 @@ msgstr ""
 "Polo xeral, os espazos extras aglutínanse nun único. Con esta opción "
 "amosaranse todos os espazos."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:36
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:37
 msgid ""
 "Run the text input through the markdown pre-processor. To learn more about "
 "markdown see"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:39
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:40
 msgid "Do not insert a Table of Contents into the output text."
 msgstr "Non introducir un índice detro do texto de saída."
 
@@ -3004,7 +3053,7 @@ msgstr "Copiar"
 msgid "Copy to Clipboard"
 msgstr "Copiar no Portapapeis"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:400
 msgid "Choose Files"
 msgstr "Escoller os Ficheiros"
 
@@ -3019,13 +3068,13 @@ msgid "User annotations generated from main library only"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:75
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:612
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:671
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:708
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:729
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:877
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1060
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:670
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:707
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:728
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:876
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:941
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1059
 msgid "No books selected"
 msgstr ""
 
@@ -3065,209 +3114,209 @@ msgstr ""
 msgid "How many empty books should be added?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:340
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:390
 msgid "Uploading books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:350
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:137
 msgid "Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
 msgid "EPUB Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
 msgid "LRF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
 msgid "HTML Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
 msgid "LIT Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
 msgid "MOBI Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
 msgid "Topaz books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
 msgid "Text books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:359
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
 msgid "PDF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:359
 msgid "Comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:360
 msgid "Archives"
 msgstr "Arquivos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:364
 msgid "Supported books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:399
 msgid "Merged some books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:401
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:400
 msgid ""
 "Some duplicates were found and merged into the following existing books:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:409
 msgid "Failed to read metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:410
 msgid "Failed to read metadata from the following"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:434
 msgid "Add to library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:460
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1229
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:459
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1228
 msgid "No book selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:434
 msgid "No book files found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:456
 msgid "Cannot delete"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:469
 msgid "Choose formats to be deleted"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:488
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:487
 msgid "Choose formats <b>not</b> to be deleted"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:507
 msgid "Cannot delete books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:509
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:508
 msgid "No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:519
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:518
 msgid "Main memory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:519
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:444
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:453
 msgid "Storage Card A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:521
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:520
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:446
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:455
 msgid "Storage Card B"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:525
 msgid "No books to delete"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:526
 msgid "None of the selected books are on the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:544
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:600
 msgid "Deleting books from device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:564
 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/actions.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:585
 msgid ""
 "The selected books will be <b>permanently deleted</b> from your device. Are "
 "you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:610
 msgid "Cannot download metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:627
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
 msgid "social metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
 msgid "covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
 msgid "metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:630
 msgid "Downloading %s for %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:654
 msgid "Failed to download some metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:656
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
 msgid "Failed to download metadata for the following:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:659
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:658
 msgid "Failed to download metadata:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:660
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:659
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:637
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:522
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:949
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:951
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
 msgid "Error"
 msgstr "Erro"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:670
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:707
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:669
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:706
 msgid "Cannot edit metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:728
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:731
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:727
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:730
 msgid "Cannot merge books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:732
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:731
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:736
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:735
 msgid ""
 "All book formats and metadata from the selected books will be added to the "
 "<b>first selected book.</b><br><br> The second and subsequently selected "
@@ -3275,7 +3324,7 @@ msgid ""
 "proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:747
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:746
 msgid ""
 "All book formats and metadata from the selected books will be merged into "
 "the <b>first selected book</b>.<br><br>After merger the second and "
@@ -3285,99 +3334,99 @@ msgid ""
 "from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:759
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:758
 msgid ""
 "You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
 "proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:876
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:875
 msgid "Cannot save to disk"
 msgstr "Non é posíbel gardar no disco"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:878
 msgid "Choose destination directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:912
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:911
 msgid "Error while saving"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:913
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:912
 msgid "There was an error while saving."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:919
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:920
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:921
 msgid "Could not save some books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:922
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:921
 msgid "Click the show details button to see which ones."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
 msgid "No books selected to generate catalog for"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:960
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:959
 msgid "Generating %s catalog..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:965
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:964
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:264
 msgid "No books found"
 msgstr "Non se acharon libros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:966
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:965
 msgid ""
 "No books to catalog\n"
 "Check exclude tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:976
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:975
 msgid "Catalog generated."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:979
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:978
 msgid "Export Catalog Directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:980
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:979
 msgid "Select destination for %s.%s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:996
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:995
 msgid "Fetching news from "
 msgstr "Obtendo novas de "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1009
 msgid " fetched."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1059
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1058
 msgid "Cannot convert"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1088
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1087
 msgid "Starting conversion of %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1265
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1264
 msgid "Cannot view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1209
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
 msgid "Choose the format to view"
 msgstr "Escoller o formato de visualización"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1218
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1217
 msgid "Multiple Books Selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1219
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1218
 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 "
@@ -3385,11 +3434,11 @@ msgid ""
 "continue?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1227
 msgid "Cannot open folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1266
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1265
 msgid "%s has no available formats."
 msgstr ""
 
@@ -3414,7 +3463,7 @@ msgid "The specified directory could not be processed."
 msgstr "Non se puido procesar o directorio especificado."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:845
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:840
 msgid "No books"
 msgstr "Sen libros"
 
@@ -3538,15 +3587,15 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:52
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:633
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:637
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:366
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:371
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:385
@@ -3570,12 +3619,12 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:265
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:186
@@ -3605,8 +3654,9 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:313
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1059
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1065
 msgid "Path"
 msgstr "Camiño"
 
@@ -3623,8 +3673,8 @@ msgid "Formats"
 msgstr "Formatos"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:25
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:886
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1062
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:891
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1068
 msgid "Collections"
 msgstr ""
 
@@ -3637,12 +3687,12 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:305
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:311
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:317
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1068
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1072
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1074
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:458
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:467
 msgid "None"
 msgstr "Ningún"
 
@@ -4703,11 +4753,11 @@ msgid ""
 "href=\"http://calibre-ebook.com/user_manual/xpath.html\">XPath Tutorial</a>."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:127
 msgid "Cover browser could not be loaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:179
 msgid "Browse by covers"
 msgstr ""
 
@@ -4897,128 +4947,124 @@ msgstr ""
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:778
-msgid "Connected "
-msgstr "Conectado "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:846
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:851
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:846
 msgid "Choose format to send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:860
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:855
 msgid "No device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:856
 msgid "Cannot send: No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:868
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:859
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:863
 msgid "No card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:869
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:860
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:910
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:905
 msgid "E-book:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:913
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:908
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:909
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:181
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:915
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:910
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:928
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:923
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:958
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:965
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1057
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1118
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1236
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:953
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:961
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1053
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1115
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1234
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1242
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:959
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:954
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:966
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:962
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:984
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:980
 msgid "Failed to email books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:985
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:981
 msgid "Failed to email the following books:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:989
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:985
 msgid "Sent by email:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1016
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1012
 msgid "News:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1017
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1013
 msgid "Attached is the"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1028
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1024
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1058
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1237
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1054
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1235
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1087
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1084
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1150
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1148
 msgid "Sending news to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1201
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1244
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1243
 msgid ""
 "Could not upload the following books to the device, as no suitable formats "
 "were found. Convert the book(s) to a format supported by your device first."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1305
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1304
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1306
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1305
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -5056,7 +5102,7 @@ msgid "My Books"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:69
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:289
 msgid "Generate catalog"
 msgstr ""
 
@@ -5190,157 +5236,157 @@ msgstr ""
 msgid "Narrow"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:503
 msgid "System port selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:503
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:504
 msgid ""
 "The value <b>%d</b> you have chosen for the content server port is a system "
 "port. Your operating system <b>may</b> not allow the server to run on this "
 "port. To be safe choose a port number larger than 1024."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:524
 msgid "Failed to install command line tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:527
 msgid "Command line tools installed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:528
 msgid "Command line tools installed in"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:529
 msgid ""
 "If you move calibre.app, you have to re-install the command line tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:580
 msgid "No valid plugin path"
 msgstr "O camiño do engadido non é correcto"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:581
 msgid "%s is not a valid plugin path"
 msgstr "%s non é correcto como camiño do engadido"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:584
 msgid "Choose plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:596
 msgid "Plugin cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:597
 msgid "The plugin: %s cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:606
 msgid "Plugin not customizable"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:607
 msgid "Plugin: %s does not need customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:615
 msgid "Customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:652
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:653
 msgid "Cannot remove builtin plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:653
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:654
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:684
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:685
 msgid "You must select a column to delete it"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:690
 msgid "The selected column is not a custom column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:690
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:691
 #: /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/config/__init__.py:691
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:692
 msgid "Do you really want to delete column %s and all its data?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:758
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:759
 msgid "Error log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:765
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:766
 msgid "Access log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:793
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:794
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:332
 msgid "Failed to start content server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:817
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:818
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:587
 msgid "Select location for books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:824
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:825
 msgid "Invalid size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:825
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:826
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:884
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:889
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:891
 msgid "Invalid database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:885
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:887
 msgid "Invalid database location "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:888
 msgid "<br>Must be a directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:890
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:892
 msgid "Invalid database location.<br>Cannot write to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:895
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:897
 msgid "Must restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:896
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:898
 msgid ""
 "The changes you made require that Calibre be restarted. Please restart as "
 "soon as practical."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:930
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:932
 msgid "Checking database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:950
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:952
 msgid "Failed to check database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:957
 msgid "Some inconsistencies found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:956
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:958
 msgid ""
 "The following books had formats listed in the database that are not actually "
 "available. The entries for the formats have been removed. You should check "
@@ -5468,296 +5514,300 @@ msgstr ""
 msgid "Sending to &device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:167
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
 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/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
 msgid "Browse for the new database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
 msgid "Show notification when &new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
 msgid "Download &social metadata (tags/ratings/etc.) by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
 msgid "&Overwrite author and title by default when fetching metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
 msgid "Default network &timeout:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
 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/config_ui.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
 msgid " seconds"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
 msgid "Normal"
 msgstr "Normal"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
 msgid "High"
 msgstr "Alto"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
 msgid "Low"
 msgstr "Baixo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
 msgid "Job &priority:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
 msgid "Preferred &output format:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
 msgid "Preferred &input format order:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
 msgid "Use &Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
 msgid "Show &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
 msgid "Show &average ratings in the tags browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
 msgid "Search as you type"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
 msgid "&Delete news from library when it is automatically sent to reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
 msgid "Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
 msgid "Large"
 msgstr "Grande"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
 msgid "Medium"
 msgstr "Medio"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
 msgid "Small"
 msgstr "Pequeno"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
 msgid "&Button size in toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
 msgid "Show &text in toolbar buttons"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
 msgid "Select visible &columns in library view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
 msgid "Remove a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
 msgid "Add a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
 msgid "Edit settings of a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
 msgid "Use internal &viewer for:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
 msgid "User Interface &layout (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
 msgid "Disable &animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
+msgid "Show &donate button (restart)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
 msgid "Add an email address to which to send books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
 msgid "&Add email"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
 msgid "Make &default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
 msgid "&Remove email"
 msgstr "&Quitar correo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
 msgid ""
 "calibre can send your books to you (or your reader) by email. Emails will be "
 "automatically sent for downloaded news to all email addresses that have Auto-"
 "send checked."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
 msgid "&Maximum number of waiting worker processes (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
 msgid "&Check database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
 msgid "&Install command line tools"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
 msgid "Open calibre &configuration directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
 msgid "Limit the max. simultaneous jobs to the available CPU &cores"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
 msgid "Debug &device detection"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
 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/config_ui.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
 msgid "Server &port:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:212
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:117
 msgid "&Username:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:213
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:119
 msgid "&Password:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
 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/config_ui.py:615
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
 msgid "Max. &cover size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:621
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:214
 msgid "&Show password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
 msgid "Max. &OPDS items per query:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
 msgid "Max. OPDS &ungrouped items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
 msgid "&Start Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:621
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
 msgid "St&op Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:626
 msgid "&Test Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
 msgid "Run server &automatically on startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:628
 msgid "View &server logs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:46
 msgid ""
 "<p>Remember to leave calibre running as the server only runs as long as "
@@ -5768,33 +5818,33 @@ msgid ""
 "the IP address of the computer calibre is running on."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:631
 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/config_ui.py:628
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:632
 msgid "Enable/&Disable plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:633
 msgid "&Customize plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:630
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:634
 msgid "&Remove plugin"
 msgstr "&Quitar engadido"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:635
 msgid "Add new plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:632
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:636
 msgid "Plugin &file:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:634
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:638
 msgid "&Add"
 msgstr ""
 
@@ -5832,9 +5882,9 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:31
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:884
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:889
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Date"
 msgstr "Data"
@@ -6026,12 +6076,18 @@ msgstr ""
 msgid "ERROR"
 msgstr "ERRO"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:67
+msgid ""
+"All checked books will be <b>permanently deleted</b> from your device. "
+"Please verify the list."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 msgid "Location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1058
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1064
 msgid "Format"
 msgstr "Formato"
 
@@ -6829,6 +6885,10 @@ msgstr ""
 msgid "Add tag to available tags and apply it to current book"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:20
+msgid "%s (was %s)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:501
 msgid "Item is blank"
@@ -7163,146 +7223,162 @@ msgstr ""
 msgid "Save single format to disk..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:53
 msgid "Edit metadata individually"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:56
 msgid "Edit metadata in bulk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:59
 msgid "Download metadata and covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:62
 msgid "Download only metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:64
 msgid "Download only covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:67
 msgid "Download only social metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:73
 msgid "Merge into first selected book - delete others"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:76
 msgid "Merge into first selected book - keep others"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:84
 msgid "Add books from a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:86
 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/init.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:90
 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/init.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:93
 msgid "Add Empty book. (Book entry with no formats)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:102
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
 msgid "Save to disk"
 msgstr "Gardar no disco"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Save to disk in a single directory"
 msgstr "Gardar no disco nun único cartafol"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:106
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:402
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:394
 msgid "Save only %s format to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:110
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:397
 msgid "Save only %s format to disk in a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:119
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
 msgid "View"
 msgstr "Ver"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:121
 msgid "View specific format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:127
 msgid "Remove selected books"
 msgstr "Quitar os libros seleccionados"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:129
 msgid "Remove files of a specific format from selected books.."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:132
 msgid "Remove all formats from selected books, except..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:135
 msgid "Remove covers from selected books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:138
 msgid "Remove matching books from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:155
 msgid "Convert individually"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:157
 msgid "Bulk convert"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:161
 msgid "Create catalog of books in your calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:169
 msgid "Run welcome wizard"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:205
 msgid "Similar books..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:237
 msgid "Add books to library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:234
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:241
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:253
 msgid "Manage collections"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:328
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:333
 msgid "Cover Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:351
 msgid "Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:372
+msgid "version"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:373
+msgid "created by Kovid Goyal"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:391
+msgid "Connected "
+msgstr "Conectado "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:400
+msgid "Update found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:454
 msgid "Book Details"
 msgstr ""
 
@@ -7386,29 +7462,29 @@ msgid "Rating"
 msgstr "Puntuación"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:324
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1084
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:674
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1176
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1182
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:886
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:885
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:890
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1156
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1162
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1165
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr ""
 
@@ -7452,11 +7528,11 @@ msgstr ""
 msgid "Restore default layout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:524
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:525
 msgid "Not allowed"
 msgstr "Non permitido"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:526
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
@@ -7653,155 +7729,163 @@ msgstr ""
 msgid "try deleting the file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:247
 msgid "calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:249
 msgid "&Restrict to:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:250
 msgid ""
 "Books display will be restricted to those matching the selected saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:251
 msgid "set in ui.py"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:252
 msgid "Advanced search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
 msgid "Alt+S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
 msgid "&Search:"
 msgstr "&Buscar:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
 msgid ""
 "<p>Search the list of books by title, author, publisher, tags, comments, "
 "etc.<br><br>Words separated by spaces are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
 msgid "Reset Quick Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
-msgid "Choose saved search or enter name for new saved search"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
 msgid "Copy current search text (instead of search name)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
 msgid "Save current search under the name shown in the box"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
 msgid "Delete current saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
 msgid "Add books"
 msgstr "Engadir libros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
 msgid "A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
 msgid "Remove books"
 msgstr "Quitar libros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
 msgid "Del"
 msgstr "Supr"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
 msgid "Edit meta information"
 msgstr "Editar metainformación"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
 msgid "E"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
 msgid "Merge book records"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
 msgid "M"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
 msgid "Send to device"
 msgstr "Enviar ao dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
 msgid "S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
 msgid "Fetch news"
 msgstr "Obter novas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
 msgid "Convert E-books"
 msgstr "Converter libros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
 msgid "C"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
 msgid "V"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
 msgid "Open containing folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
 msgid "Show book details"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
 msgid "Books by same author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
 msgid "Books in this series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
 msgid "Books by this publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
 msgid "Books with the same tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
 msgid "Configure calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
 msgid "Ctrl+P"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
+msgid "Help"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
+msgid "Browse the calibre User Manual"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
+msgid "F1"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:20
 msgid ""
 "Redirect console output to a dialog window (both stdout and stderr). Useful "
@@ -7828,32 +7912,36 @@ msgstr ""
 msgid "No matches found for this book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:91
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:262
 msgid "Search"
 msgstr "Buscar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:313
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:315
 msgid "The selected search will be <b>permanently deleted</b>. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:357
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:392
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:398
 msgid "Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:406
+msgid "Choose saved search or enter name for new saved search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:47
 msgid "({0} of {1})"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:53
 msgid "(all books)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:55
 msgid "({0} of all)"
 msgstr ""
 
@@ -7976,18 +8064,31 @@ msgstr ""
 msgid "Sort by average rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:775
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:772
+msgid "Set the sort order for entries in the Tag Browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:778
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:775
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:778
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:783
+msgid ""
+"When selecting multiple entries in the Tag Browser match any or all of them"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:787
 msgid "Manage &user categories"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:790
+msgid "Add your own categories to the Tag Browser"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182
 msgid "Convert book %d of %d (%s)"
@@ -8013,15 +8114,15 @@ msgstr ""
 msgid "Queueing "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:239
 msgid "Fetch news from "
 msgstr "Obter novas de "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:301
 msgid "Convert existing"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:302
 msgid ""
 "The following books have already been converted to %s format. Do you wish to "
 "reconvert them?"
@@ -8035,104 +8136,91 @@ msgstr ""
 msgid "&Donate to support calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:168
 msgid "&Eject connected device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:173
 msgid "&Restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:206
-msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:212
-msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:227
 msgid "Calibre Quick Start Guide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:389
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:381
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:377
 msgid "Cannot configure while there are running jobs."
 msgstr "Non se pode configurar mentres haxa traballos en execución."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:382
 msgid "Cannot configure before calibre is restarted."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:425
 msgid "No detailed info available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:426
 msgid "No detailed information is available for books on the device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:486
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:478
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:506
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:487
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:479
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using third party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:492
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:507
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:547
 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."
+"you find it useful, please consider donating to support its development. "
+"Your donation helps keep calibre development going."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:573
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr "Hai traballos en activo. Está seguro de querer saír?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:576
 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/ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 msgid "WARNING: Active jobs"
 msgstr "Aviso: traballos en activo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:640
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:633
 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/update.py:52
-msgid ""
-"<span style=\"color:red; font-weight:bold\">Latest version: <a "
-"href=\"%s\">%s</a></span>"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/update.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:56
 msgid "Update available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/update.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:57
 msgid ""
 "%s has been updated to version %s. See the <a href=\"http://calibre-"
 "ebook.com/whats-new\">new features</a>. Visit the download page?"
@@ -8610,32 +8698,25 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:270
 msgid ""
 "Library\n"
-"%d\n"
-"books"
+"%d books"
 msgstr ""
-"Biblioteca\n"
-"%d\n"
-"libros"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:271
 msgid ""
 "Reader\n"
-"%s\n"
-"available"
+"%s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:272
 msgid ""
 "Card A\n"
-"%s\n"
-"available"
+"%s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:273
 msgid ""
 "Card B\n"
-"%s\n"
-"available"
+"%s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:277
@@ -8658,35 +8739,39 @@ msgstr ""
 msgid "Books located at"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:306
+msgid "free"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:557
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:558
 msgid "Upper Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:559
 msgid "Lower Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:560
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:561
 msgid "Title Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:974
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:983
 msgid "Drag to resize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1015
 msgid "Show"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1012
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1022
 msgid "Hide"
 msgstr ""
 
@@ -9955,89 +10040,89 @@ msgstr "Fonte de Novas Descoñecida"
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:706
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:708
 msgid "Download finished"
 msgstr "Rematou a descarga"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:708
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:710
 msgid "Failed to download the following articles:"
 msgstr "Produciuse un fallo na descarga dos seguintes artigos:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:714
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:716
 msgid "Failed to download parts of the following articles:"
 msgstr "Produciuse un fallo na descarga de partes do seguintes artigos:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:716
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:718
 msgid " from "
 msgstr " desde "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:718
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:720
 msgid "\tFailed links:"
 msgstr "\tLigazóns erradas:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:807
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:809
 msgid "Could not fetch article. Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:828
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:830
 msgid "Fetching feeds..."
 msgstr "A obter os fluxos..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:833
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:835
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:839
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:841
 msgid "Trying to download cover..."
 msgstr "Tratando de descargar a capa..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:841
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:922
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:924
 msgid "Starting download [%d thread(s)]..."
 msgstr "A comezar a descarga [%d fío(s)]..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:938
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:940
 msgid "Feeds downloaded to %s"
 msgstr "Fluxos descargados en %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:948
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:950
 msgid "Could not download cover: %s"
 msgstr "Non se puido descargar a capa: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:960
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
 msgid "Downloading cover from %s"
 msgstr "A descargar a capa desde %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1002
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1190
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1192
 msgid "Untitled Article"
 msgstr "Artigo sen Título"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1261
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1263
 msgid "Article downloaded: %s"
 msgstr "Artigo descargado: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1272
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1274
 msgid "Article download failed: %s"
 msgstr "Erro ao descargar o artigo: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1289
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1291
 msgid "Fetching feed"
 msgstr "A obter o fluxo"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1436
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1438
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1452
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1454
 msgid ""
 "You do not have permission to download this issue. Either your subscription "
 "has expired or you have exceeded the maximum allowed downloads for today."
@@ -10150,6 +10235,15 @@ msgstr "Non descargar follas de estilo CSS"
 #~ msgid "Choose a location for your ebook library."
 #~ msgstr "Elixa unha localización para a súa biblioteca de libros."
 
+#~ msgid ""
+#~ "Library\n"
+#~ "%d\n"
+#~ "books"
+#~ msgstr ""
+#~ "Biblioteca\n"
+#~ "%d\n"
+#~ "libros"
+
 #~ msgid "Communicate with the Sony PRS-600/700/900 eBook reader."
 #~ msgstr "Comunicar co lector Sony PRS-600/700/900."
 
diff --git a/src/calibre/translations/he.po b/src/calibre/translations/he.po
index 49d67316b5..8e995d5c6e 100644
--- a/src/calibre/translations/he.po
+++ b/src/calibre/translations/he.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-07-03 01:21+0000\n"
-"PO-Revision-Date: 2010-07-02 18:28+0000\n"
+"POT-Creation-Date: 2010-07-09 22:00+0000\n"
+"PO-Revision-Date: 2010-07-09 20:23+0000\n"
 "Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Hebrew <he@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: 2010-07-03 03:44+0000\n"
+"X-Launchpad-Export-Date: 2010-07-10 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
@@ -27,10 +27,10 @@ msgstr "לא עושה דבר"
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:71
 #: /home/kovid/work/calibre/src/calibre/devices/prs500/books.py:267
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:466
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:492
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:396
-#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:98
-#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:101
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:97
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:100
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/metadata.py:56
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:428
 #: /home/kovid/work/calibre/src/calibre/ebooks/fb2/input.py:67
@@ -72,9 +72,9 @@ msgstr "לא עושה דבר"
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:818
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:49
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:51
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:910
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:915
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:981
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:911
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:916
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:982
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:137
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:139
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:108
@@ -102,20 +102,20 @@ msgstr "לא עושה דבר"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:233
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:290
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:815
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:818
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:814
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:817
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:172
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:179
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:22
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:135
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:903
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:912
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1192
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1195
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:898
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:907
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1190
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1193
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:120
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:155
@@ -123,8 +123,8 @@ msgstr "לא עושה דבר"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:172
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:362
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:877
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1054
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:882
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1060
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:87
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:92
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:185
@@ -170,7 +170,7 @@ msgstr "כתיבת תגיות מטא"
 msgid "Catalog generator"
 msgstr "יצירת קטלוג"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:15
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:16
 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 "
@@ -179,62 +179,62 @@ msgstr ""
 "עקוב אחר כל הקישורים המקומיים בקובץ HTML וצור קובץ ZIP המכיל את כל הקבצים "
 "המקושרים. תוסף זה רץ בכל פעם שמתווסף קובץ HTML לספרייה."
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:51
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:52
 msgid ""
 "Character encoding for the input HTML files. Common choices include: cp1252, "
 "latin1, iso-8859-1 and utf-8."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:58
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:59
 msgid ""
 "Create a PMLZ archive containing the PML file and all images in the "
 "directory pmlname_img or images. This plugin is run every time you add a PML "
 "file to the library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:90
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:93
 msgid "Extract cover from comic files"
 msgstr "חלץ עטיפה מקובץ קומיקס"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:117
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:128
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:140
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:150
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:160
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:171
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:181
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:191
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:201
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:211
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:221
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:232
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:243
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:255
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:276
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:287
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:297
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:307
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:120
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:131
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:153
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:163
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:174
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:184
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:194
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:204
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:214
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:224
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:235
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:246
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:258
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:279
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:290
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:300
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:310
 msgid "Read metadata from %s files"
 msgstr "קרא תגיות מטא מ- %s קבצים"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:266
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:269
 msgid "Read metadata from ebooks in RAR archives"
 msgstr "קרא תגיות מטא מספרים בקובץ ארכיון RAR"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:318
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:321
 msgid "Read metadata from ebooks in ZIP archives"
 msgstr "קרא תגיות מטא מספרים בקובץ ארכיון ZIP"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:331
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:341
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:351
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:373
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:384
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:394
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:334
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:344
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:354
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:376
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:387
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:397
 msgid "Set metadata in %s files"
 msgstr "כתוב תגיות מטא מ- %s קבצים"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:362
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:365
 msgid "Set metadata from %s files"
 msgstr "כתוב תגיות מטא מ- %s קבצים"
 
@@ -388,35 +388,35 @@ msgstr ""
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr "פרופיל זה מיועד למכשיר Amazon Kindle DX."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:31
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
 msgid "Installed plugins"
 msgstr "תוספים מותקנים"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:33
 msgid "Mapping for filetype plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:33
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:34
 msgid "Local plugin customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:34
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
 msgid "Disabled plugins"
 msgstr "תוספים מבוטלים"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
 msgid "Enabled plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:83
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:84
 msgid "No valid plugin found in "
 msgstr "לא נמצאו תוספים תקינים ב- "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:460
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:468
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:493
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
 msgid ""
 "    %prog options\n"
 "\n"
@@ -424,29 +424,29 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:499
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr "הוסף רכיב  על ידי הגדרת הנתיב לקובץ ZIP המכיל אותו."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr "הסר רכיב מותאם לפי שם. ללא השפעה על הרכיבים המותקנים בהתקנה ראשונית."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:503
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:511
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
 msgstr "התאמת רכיב. ציין שם רכיב ומחרוזת התאמה מופרדים על ידי פסיק."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:505
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:513
 msgid "List all installed plugins"
 msgstr "הצג את כל הרכיבים המותקנים."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Enable the named plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Disable the named plugin"
 msgstr ""
 
@@ -597,7 +597,7 @@ msgstr "מחליף נתונים עם Hanlin V5 eBook readers."
 msgid "Communicate with the BOOX eBook reader."
 msgstr "מחליף נתונים עם BOOX eBook reader."
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:121
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:123
 msgid ""
 "Comma separated list of directories to send e-books to on the device. The "
 "first one that exists will be used."
@@ -668,7 +668,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:51
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:54
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:57
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:157
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:159
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:64
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:67
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:70
@@ -678,22 +678,22 @@ msgstr ""
 msgid "Getting list of books on device..."
 msgstr "קורא את רשימת הספרים מההתקן..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:218
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:258
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:219
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:263
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:244
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:262
 msgid "Removing books from device..."
 msgstr "מסיר ספרים מהמכשיר"
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:262
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:269
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:267
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:274
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:269
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:274
 msgid "Removing books from device metadata listing..."
 msgstr "מסיר ספרים מרשימת הספרים במכשיר"
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:274
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:308
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:313
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:208
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:238
 msgid "Adding books to device metadata listing..."
@@ -711,6 +711,10 @@ msgstr ""
 msgid "Communicate with the Sweex MM300"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/misc.py:75
+msgid "Communicate with the Pandigital Novel"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:17
 msgid "Communicate with the Nokia 770 internet tablet."
 msgstr ""
@@ -1470,6 +1474,51 @@ msgstr ""
 msgid "Creating"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/__init__.py:18
+msgid "ePub Fixer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/epubcheck.py:18
+msgid "Workaround epubcheck bugs"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/epubcheck.py:22
+msgid ""
+"Workarounds for bugs in the latest release of epubcheck. epubcheck reports "
+"many things as errors that are not actually errors. %prog will try to detect "
+"these and replace them with constructs that epubcheck likes. This may cause "
+"significant changes to your epub, complain to the epubcheck project."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:19
+msgid ""
+"%prog [options] file.epub\n"
+"\n"
+"Fix common problems in EPUB files that can cause them to be rejected by "
+"poorly designed publishing services.\n"
+"\n"
+"By default, no fixing is done and messages are printed out for each error "
+"detected. Use the options to control which errors are automatically fixed."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:50
+msgid "You must specify an epub file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:17
+msgid "Fix unmanifested files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:21
+msgid ""
+"Fix unmanifested files. %prog can either add them to the manifest or delete "
+"them as specified by the delete unmanifested option."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:32
+msgid "Delete unmanifested files instead of adding them to the manifest"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:56
 msgid ""
 "Extract the contents of the generated EPUB file to the specified directory. "
@@ -1778,11 +1827,11 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:98
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:882
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:887
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:543
 msgid "Title"
 msgstr ""
@@ -1791,7 +1840,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:364
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:883
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:888
 msgid "Author(s)"
 msgstr ""
 
@@ -1814,7 +1863,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:67
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:318
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1073
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1079
 msgid "Comments"
 msgstr ""
 
@@ -1823,7 +1872,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:306
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1069
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1075
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:139
 msgid "Tags"
 msgstr ""
@@ -1833,7 +1882,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:323
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1084
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:87
 msgid "Series"
 msgstr ""
@@ -1843,7 +1892,7 @@ msgid "Language"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:406
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1067
 msgid "Timestamp"
 msgstr ""
 
@@ -2068,7 +2117,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1226
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1398
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1399
 msgid "Cover"
 msgstr ""
 
@@ -2107,70 +2156,70 @@ msgstr ""
 msgid "This is an Amazon Topaz book. It cannot be processed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1399
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1400
 msgid "Title Page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1400
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1401
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:15
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:53
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:194
 msgid "Table of Contents"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1401
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1402
 msgid "Index"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1402
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1403
 msgid "Glossary"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1403
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1404
 msgid "Acknowledgements"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1404
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1405
 msgid "Bibliography"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1405
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1406
 msgid "Colophon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1406
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1407
 msgid "Copyright"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1407
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1408
 msgid "Dedication"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1408
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1409
 msgid "Epigraph"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1409
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1410
 msgid "Foreword"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1410
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1411
 msgid "List of Illustrations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1411
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1412
 msgid "List of Tables"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1412
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1413
 msgid "Notes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1413
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1414
 msgid "Preface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1414
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1415
 msgid "Main Text"
 msgstr ""
 
@@ -2214,7 +2263,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:22
 #: /home/kovid/work/calibre/src/calibre/ebooks/tcr/input.py:23
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:23
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:24
 msgid ""
 "Normally calibre treats blank lines as paragraph markers. With this option "
 "it will assume that every line represents a paragraph instead."
@@ -2222,7 +2271,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:26
 #: /home/kovid/work/calibre/src/calibre/ebooks/tcr/input.py:27
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:27
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:28
 msgid ""
 "Normally calibre treats blank lines as paragraph markers. With this option "
 "it will assume that every line starting with an indent (either a tab or 2+ "
@@ -2351,7 +2400,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
 msgid "Author"
 msgstr ""
@@ -2486,19 +2535,19 @@ msgid ""
 "slowest."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:33
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:34
 msgid ""
 "Normally extra spaces are condensed into a single space. With this option "
 "all spaces will be displayed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:36
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:37
 msgid ""
 "Run the text input through the markdown pre-processor. To learn more about "
 "markdown see"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:39
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:40
 msgid "Do not insert a Table of Contents into the output text."
 msgstr ""
 
@@ -2660,7 +2709,7 @@ msgstr ""
 msgid "Copy to Clipboard"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:400
 msgid "Choose Files"
 msgstr ""
 
@@ -2675,13 +2724,13 @@ msgid "User annotations generated from main library only"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:75
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:612
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:671
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:708
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:729
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:877
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1060
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:670
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:707
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:728
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:876
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:941
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1059
 msgid "No books selected"
 msgstr ""
 
@@ -2721,209 +2770,209 @@ msgstr ""
 msgid "How many empty books should be added?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:340
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:390
 msgid "Uploading books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:350
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:137
 msgid "Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
 msgid "EPUB Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
 msgid "LRF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
 msgid "HTML Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
 msgid "LIT Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
 msgid "MOBI Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
 msgid "Topaz books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
 msgid "Text books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:359
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
 msgid "PDF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:359
 msgid "Comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:360
 msgid "Archives"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:364
 msgid "Supported books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:399
 msgid "Merged some books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:401
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:400
 msgid ""
 "Some duplicates were found and merged into the following existing books:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:409
 msgid "Failed to read metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:410
 msgid "Failed to read metadata from the following"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:434
 msgid "Add to library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:460
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1229
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:459
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1228
 msgid "No book selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:434
 msgid "No book files found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:456
 msgid "Cannot delete"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:469
 msgid "Choose formats to be deleted"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:488
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:487
 msgid "Choose formats <b>not</b> to be deleted"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:507
 msgid "Cannot delete books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:509
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:508
 msgid "No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:519
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:518
 msgid "Main memory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:519
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:444
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:453
 msgid "Storage Card A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:521
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:520
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:446
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:455
 msgid "Storage Card B"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:525
 msgid "No books to delete"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:526
 msgid "None of the selected books are on the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:544
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:600
 msgid "Deleting books from device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:564
 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/actions.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:585
 msgid ""
 "The selected books will be <b>permanently deleted</b> from your device. Are "
 "you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:610
 msgid "Cannot download metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:627
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
 msgid "social metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
 msgid "covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
 msgid "metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:630
 msgid "Downloading %s for %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:654
 msgid "Failed to download some metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:656
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
 msgid "Failed to download metadata for the following:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:659
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:658
 msgid "Failed to download metadata:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:660
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:659
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:637
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:522
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:949
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:951
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
 msgid "Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:670
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:707
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:669
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:706
 msgid "Cannot edit metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:728
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:731
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:727
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:730
 msgid "Cannot merge books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:732
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:731
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:736
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:735
 msgid ""
 "All book formats and metadata from the selected books will be added to the "
 "<b>first selected book.</b><br><br> The second and subsequently selected "
@@ -2931,7 +2980,7 @@ msgid ""
 "proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:747
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:746
 msgid ""
 "All book formats and metadata from the selected books will be merged into "
 "the <b>first selected book</b>.<br><br>After merger the second and "
@@ -2941,99 +2990,99 @@ msgid ""
 "from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:759
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:758
 msgid ""
 "You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
 "proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:876
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:875
 msgid "Cannot save to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:878
 msgid "Choose destination directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:912
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:911
 msgid "Error while saving"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:913
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:912
 msgid "There was an error while saving."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:919
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:920
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:921
 msgid "Could not save some books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:922
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:921
 msgid "Click the show details button to see which ones."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
 msgid "No books selected to generate catalog for"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:960
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:959
 msgid "Generating %s catalog..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:965
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:964
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:264
 msgid "No books found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:966
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:965
 msgid ""
 "No books to catalog\n"
 "Check exclude tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:976
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:975
 msgid "Catalog generated."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:979
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:978
 msgid "Export Catalog Directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:980
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:979
 msgid "Select destination for %s.%s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:996
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:995
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1009
 msgid " fetched."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1059
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1058
 msgid "Cannot convert"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1088
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1087
 msgid "Starting conversion of %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1265
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1264
 msgid "Cannot view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1209
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
 msgid "Choose the format to view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1218
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1217
 msgid "Multiple Books Selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1219
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1218
 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 "
@@ -3041,11 +3090,11 @@ msgid ""
 "continue?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1227
 msgid "Cannot open folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1266
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1265
 msgid "%s has no available formats."
 msgstr ""
 
@@ -3070,7 +3119,7 @@ msgid "The specified directory could not be processed."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:845
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:840
 msgid "No books"
 msgstr ""
 
@@ -3194,15 +3243,15 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:52
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:633
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:637
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:366
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:371
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:385
@@ -3226,12 +3275,12 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:265
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:186
@@ -3261,8 +3310,9 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:313
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1059
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1065
 msgid "Path"
 msgstr ""
 
@@ -3279,8 +3329,8 @@ msgid "Formats"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:25
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:886
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1062
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:891
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1068
 msgid "Collections"
 msgstr ""
 
@@ -3293,12 +3343,12 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:305
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:311
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:317
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1068
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1072
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1074
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:458
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:467
 msgid "None"
 msgstr ""
 
@@ -4357,11 +4407,11 @@ msgid ""
 "href=\"http://calibre-ebook.com/user_manual/xpath.html\">XPath Tutorial</a>."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:127
 msgid "Cover browser could not be loaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:179
 msgid "Browse by covers"
 msgstr ""
 
@@ -4551,128 +4601,124 @@ msgstr ""
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:778
-msgid "Connected "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:846
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:851
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:846
 msgid "Choose format to send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:860
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:855
 msgid "No device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:856
 msgid "Cannot send: No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:868
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:859
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:863
 msgid "No card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:869
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:860
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:910
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:905
 msgid "E-book:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:913
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:908
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:909
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:181
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:915
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:910
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:928
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:923
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:958
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:965
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1057
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1118
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1236
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:953
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:961
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1053
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1115
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1234
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1242
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:959
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:954
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:966
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:962
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:984
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:980
 msgid "Failed to email books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:985
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:981
 msgid "Failed to email the following books:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:989
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:985
 msgid "Sent by email:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1016
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1012
 msgid "News:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1017
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1013
 msgid "Attached is the"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1028
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1024
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1058
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1237
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1054
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1235
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1087
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1084
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1150
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1148
 msgid "Sending news to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1201
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1244
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1243
 msgid ""
 "Could not upload the following books to the device, as no suitable formats "
 "were found. Convert the book(s) to a format supported by your device first."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1305
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1304
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1306
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1305
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -4710,7 +4756,7 @@ msgid "My Books"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:69
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:289
 msgid "Generate catalog"
 msgstr ""
 
@@ -4843,157 +4889,157 @@ msgstr ""
 msgid "Narrow"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:503
 msgid "System port selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:503
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:504
 msgid ""
 "The value <b>%d</b> you have chosen for the content server port is a system "
 "port. Your operating system <b>may</b> not allow the server to run on this "
 "port. To be safe choose a port number larger than 1024."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:524
 msgid "Failed to install command line tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:527
 msgid "Command line tools installed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:528
 msgid "Command line tools installed in"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:529
 msgid ""
 "If you move calibre.app, you have to re-install the command line tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:580
 msgid "No valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:581
 msgid "%s is not a valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:584
 msgid "Choose plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:596
 msgid "Plugin cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:597
 msgid "The plugin: %s cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:606
 msgid "Plugin not customizable"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:607
 msgid "Plugin: %s does not need customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:615
 msgid "Customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:652
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:653
 msgid "Cannot remove builtin plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:653
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:654
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:684
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:685
 msgid "You must select a column to delete it"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:690
 msgid "The selected column is not a custom column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:690
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:691
 #: /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/config/__init__.py:691
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:692
 msgid "Do you really want to delete column %s and all its data?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:758
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:759
 msgid "Error log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:765
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:766
 msgid "Access log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:793
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:794
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:332
 msgid "Failed to start content server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:817
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:818
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:587
 msgid "Select location for books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:824
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:825
 msgid "Invalid size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:825
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:826
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:884
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:889
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:891
 msgid "Invalid database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:885
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:887
 msgid "Invalid database location "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:888
 msgid "<br>Must be a directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:890
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:892
 msgid "Invalid database location.<br>Cannot write to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:895
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:897
 msgid "Must restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:896
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:898
 msgid ""
 "The changes you made require that Calibre be restarted. Please restart as "
 "soon as practical."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:930
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:932
 msgid "Checking database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:950
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:952
 msgid "Failed to check database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:957
 msgid "Some inconsistencies found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:956
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:958
 msgid ""
 "The following books had formats listed in the database that are not actually "
 "available. The entries for the formats have been removed. You should check "
@@ -5121,296 +5167,300 @@ msgstr ""
 msgid "Sending to &device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:167
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
 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/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
 msgid "Browse for the new database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
 msgid "Show notification when &new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
 msgid "Download &social metadata (tags/ratings/etc.) by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
 msgid "&Overwrite author and title by default when fetching metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
 msgid "Default network &timeout:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
 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/config_ui.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
 msgid " seconds"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
 msgid "Normal"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
 msgid "High"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
 msgid "Low"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
 msgid "Job &priority:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
 msgid "Preferred &output format:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
 msgid "Preferred &input format order:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
 msgid "Use &Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
 msgid "Show &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
 msgid "Show &average ratings in the tags browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
 msgid "Search as you type"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
 msgid "&Delete news from library when it is automatically sent to reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
 msgid "Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
 msgid "Small"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
 msgid "&Button size in toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
 msgid "Show &text in toolbar buttons"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
 msgid "Select visible &columns in library view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
 msgid "Remove a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
 msgid "Add a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
 msgid "Edit settings of a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
 msgid "Use internal &viewer for:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
 msgid "User Interface &layout (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
 msgid "Disable &animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
-msgid "Add an email address to which to send books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
-msgid "&Add email"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
-msgid "Make &default"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
-msgid "&Remove email"
+msgid "Show &donate button (restart)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
+msgid "Add an email address to which to send books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
+msgid "&Add email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
+msgid "Make &default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
+msgid "&Remove email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
 msgid ""
 "calibre can send your books to you (or your reader) by email. Emails will be "
 "automatically sent for downloaded news to all email addresses that have Auto-"
 "send checked."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
 msgid "&Maximum number of waiting worker processes (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
 msgid "&Check database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
 msgid "&Install command line tools"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
 msgid "Open calibre &configuration directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
 msgid "Limit the max. simultaneous jobs to the available CPU &cores"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
 msgid "Debug &device detection"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
 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/config_ui.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
 msgid "Server &port:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:212
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:117
 msgid "&Username:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:213
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:119
 msgid "&Password:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
 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/config_ui.py:615
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
 msgid "Max. &cover size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:621
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:214
 msgid "&Show password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
 msgid "Max. &OPDS items per query:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
 msgid "Max. OPDS &ungrouped items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
 msgid "&Start Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:621
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
 msgid "St&op Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:626
 msgid "&Test Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
 msgid "Run server &automatically on startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:628
 msgid "View &server logs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:46
 msgid ""
 "<p>Remember to leave calibre running as the server only runs as long as "
@@ -5421,33 +5471,33 @@ msgid ""
 "the IP address of the computer calibre is running on."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:631
 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/config_ui.py:628
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:632
 msgid "Enable/&Disable plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:633
 msgid "&Customize plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:630
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:634
 msgid "&Remove plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:635
 msgid "Add new plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:632
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:636
 msgid "Plugin &file:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:634
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:638
 msgid "&Add"
 msgstr ""
 
@@ -5485,9 +5535,9 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:31
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:884
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:889
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Date"
 msgstr ""
@@ -5679,12 +5729,18 @@ msgstr ""
 msgid "ERROR"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:67
+msgid ""
+"All checked books will be <b>permanently deleted</b> from your device. "
+"Please verify the list."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 msgid "Location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1058
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1064
 msgid "Format"
 msgstr ""
 
@@ -6482,6 +6538,10 @@ msgstr ""
 msgid "Add tag to available tags and apply it to current book"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:20
+msgid "%s (was %s)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:501
 msgid "Item is blank"
@@ -6816,146 +6876,162 @@ msgstr ""
 msgid "Save single format to disk..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:53
 msgid "Edit metadata individually"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:56
 msgid "Edit metadata in bulk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:59
 msgid "Download metadata and covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:62
 msgid "Download only metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:64
 msgid "Download only covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:67
 msgid "Download only social metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:73
 msgid "Merge into first selected book - delete others"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:76
 msgid "Merge into first selected book - keep others"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:84
 msgid "Add books from a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:86
 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/init.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:90
 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/init.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:93
 msgid "Add Empty book. (Book entry with no formats)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:102
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
 msgid "Save to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Save to disk in a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:106
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:402
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:394
 msgid "Save only %s format to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:110
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:397
 msgid "Save only %s format to disk in a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:119
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
 msgid "View"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:121
 msgid "View specific format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:127
 msgid "Remove selected books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:129
 msgid "Remove files of a specific format from selected books.."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:132
 msgid "Remove all formats from selected books, except..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:135
 msgid "Remove covers from selected books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:138
 msgid "Remove matching books from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:155
 msgid "Convert individually"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:157
 msgid "Bulk convert"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:161
 msgid "Create catalog of books in your calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:169
 msgid "Run welcome wizard"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:205
 msgid "Similar books..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:237
 msgid "Add books to library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:234
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:241
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:253
 msgid "Manage collections"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:328
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:333
 msgid "Cover Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:351
 msgid "Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:372
+msgid "version"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:373
+msgid "created by Kovid Goyal"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:391
+msgid "Connected "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:400
+msgid "Update found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:454
 msgid "Book Details"
 msgstr ""
 
@@ -7039,29 +7115,29 @@ msgid "Rating"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:324
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1084
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:674
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1176
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1182
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:886
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:885
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:890
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1156
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1162
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1165
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr ""
 
@@ -7105,11 +7181,11 @@ msgstr ""
 msgid "Restore default layout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:524
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:525
 msgid "Not allowed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:526
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
@@ -7306,155 +7382,163 @@ msgstr ""
 msgid "try deleting the file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:247
 msgid "calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:249
 msgid "&Restrict to:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:250
 msgid ""
 "Books display will be restricted to those matching the selected saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:251
 msgid "set in ui.py"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:252
 msgid "Advanced search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
 msgid "Alt+S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
 msgid "&Search:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
 msgid ""
 "<p>Search the list of books by title, author, publisher, tags, comments, "
 "etc.<br><br>Words separated by spaces are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
 msgid "Reset Quick Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
-msgid "Choose saved search or enter name for new saved search"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
 msgid "Copy current search text (instead of search name)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
 msgid "Save current search under the name shown in the box"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
 msgid "Delete current saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
 msgid "Add books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
 msgid "A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
 msgid "Remove books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
 msgid "Del"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
 msgid "Edit meta information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
 msgid "E"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
 msgid "Merge book records"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
 msgid "M"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
 msgid "Send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
 msgid "S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
 msgid "Convert E-books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
 msgid "C"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
 msgid "V"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
 msgid "Open containing folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
 msgid "Show book details"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
 msgid "Books by same author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
 msgid "Books in this series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
 msgid "Books by this publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
 msgid "Books with the same tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
 msgid "Configure calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
 msgid "Ctrl+P"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
+msgid "Help"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
+msgid "Browse the calibre User Manual"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
+msgid "F1"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:20
 msgid ""
 "Redirect console output to a dialog window (both stdout and stderr). Useful "
@@ -7481,32 +7565,36 @@ msgstr ""
 msgid "No matches found for this book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:91
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:262
 msgid "Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:313
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:315
 msgid "The selected search will be <b>permanently deleted</b>. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:357
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:392
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:398
 msgid "Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:406
+msgid "Choose saved search or enter name for new saved search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:47
 msgid "({0} of {1})"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:53
 msgid "(all books)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:55
 msgid "({0} of all)"
 msgstr ""
 
@@ -7629,18 +7717,31 @@ msgstr ""
 msgid "Sort by average rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:775
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:772
+msgid "Set the sort order for entries in the Tag Browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:778
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:775
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:778
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:783
+msgid ""
+"When selecting multiple entries in the Tag Browser match any or all of them"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:787
 msgid "Manage &user categories"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:790
+msgid "Add your own categories to the Tag Browser"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182
 msgid "Convert book %d of %d (%s)"
@@ -7666,15 +7767,15 @@ msgstr ""
 msgid "Queueing "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:239
 msgid "Fetch news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:301
 msgid "Convert existing"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:302
 msgid ""
 "The following books have already been converted to %s format. Do you wish to "
 "reconvert them?"
@@ -7688,104 +7789,91 @@ msgstr ""
 msgid "&Donate to support calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:168
 msgid "&Eject connected device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:173
 msgid "&Restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:206
-msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:212
-msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:227
 msgid "Calibre Quick Start Guide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:389
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:381
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:377
 msgid "Cannot configure while there are running jobs."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:382
 msgid "Cannot configure before calibre is restarted."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:425
 msgid "No detailed info available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:426
 msgid "No detailed information is available for books on the device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:486
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:478
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:506
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:487
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:479
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using third party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:492
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:507
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:547
 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."
+"you find it useful, please consider donating to support its development. "
+"Your donation helps keep calibre development going."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:573
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:576
 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/ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:640
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:633
 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/update.py:52
-msgid ""
-"<span style=\"color:red; font-weight:bold\">Latest version: <a "
-"href=\"%s\">%s</a></span>"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/update.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:56
 msgid "Update available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/update.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:57
 msgid ""
 "%s has been updated to version %s. See the <a href=\"http://calibre-"
 "ebook.com/whats-new\">new features</a>. Visit the download page?"
@@ -8263,29 +8351,25 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:270
 msgid ""
 "Library\n"
-"%d\n"
-"books"
+"%d books"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:271
 msgid ""
 "Reader\n"
-"%s\n"
-"available"
+"%s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:272
 msgid ""
 "Card A\n"
-"%s\n"
-"available"
+"%s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:273
 msgid ""
 "Card B\n"
-"%s\n"
-"available"
+"%s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:277
@@ -8308,35 +8392,39 @@ msgstr ""
 msgid "Books located at"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:306
+msgid "free"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:557
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:558
 msgid "Upper Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:559
 msgid "Lower Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:560
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:561
 msgid "Title Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:974
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:983
 msgid "Drag to resize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1015
 msgid "Show"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1012
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1022
 msgid "Hide"
 msgstr ""
 
@@ -9605,89 +9693,89 @@ msgstr ""
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:706
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:708
 msgid "Download finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:708
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:710
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:714
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:716
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:716
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:718
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:718
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:720
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:807
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:809
 msgid "Could not fetch article. Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:828
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:830
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:833
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:835
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:839
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:841
 msgid "Trying to download cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:841
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:922
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:924
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:938
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:940
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:948
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:950
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:960
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
 msgid "Downloading cover from %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1002
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1190
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1192
 msgid "Untitled Article"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1261
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1263
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1272
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1274
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1289
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1291
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1436
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1438
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1452
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1454
 msgid ""
 "You do not have permission to download this issue. Either your subscription "
 "has expired or you have exceeded the maximum allowed downloads for today."
diff --git a/src/calibre/translations/it.po b/src/calibre/translations/it.po
index 12718e182d..08bcb89f89 100644
--- a/src/calibre/translations/it.po
+++ b/src/calibre/translations/it.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre_calibre-it\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-03 01:21+0000\n"
-"PO-Revision-Date: 2010-07-07 13:36+0000\n"
+"POT-Creation-Date: 2010-07-10 16:12+0000\n"
+"PO-Revision-Date: 2010-07-16 07:15+0000\n"
 "Last-Translator: MeltingShell <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: 2010-07-08 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-07-17 03:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Bookmarks: -1,-1,-1,-1,-1,1105,-1,1312,-1,-1\n"
 "Generated-By: pygettext.py 1.5\n"
@@ -30,10 +30,10 @@ msgstr "Non fa assolutamente niente"
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:71
 #: /home/kovid/work/calibre/src/calibre/devices/prs500/books.py:267
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:466
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:396
-#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:98
-#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:101
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:492
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:398
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:97
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:100
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/metadata.py:56
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:428
 #: /home/kovid/work/calibre/src/calibre/ebooks/fb2/input.py:67
@@ -75,9 +75,9 @@ msgstr "Non fa assolutamente niente"
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:818
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:49
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:51
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:910
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:915
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:981
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:911
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:916
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:982
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:137
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:139
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:108
@@ -105,20 +105,20 @@ msgstr "Non fa assolutamente niente"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:233
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:290
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:815
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:818
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:814
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:817
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:172
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:179
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:22
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:135
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:903
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:912
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1192
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1195
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:899
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:908
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1191
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1194
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:120
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:155
@@ -126,8 +126,8 @@ msgstr "Non fa assolutamente niente"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:172
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:362
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:877
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1054
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:882
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1060
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:87
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:92
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:185
@@ -173,7 +173,7 @@ msgstr "Scrittore metadati"
 msgid "Catalog generator"
 msgstr "Generatore del catalogo"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:15
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:16
 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 "
@@ -183,7 +183,7 @@ msgstr ""
 "tutti i file collegati. Questo plug-in viene eseguito ogni volta che si "
 "aggiunge un file HTML alla biblioteca."
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:51
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:52
 msgid ""
 "Character encoding for the input HTML files. Common choices include: cp1252, "
 "latin1, iso-8859-1 and utf-8."
@@ -191,7 +191,7 @@ msgstr ""
 "Codifica dei caratteri nei file HTML in ingresso. Scelte comuni includono: "
 "cp1252, latin1, iso-8859-1 e utf-8."
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:58
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:59
 msgid ""
 "Create a PMLZ archive containing the PML file and all images in the "
 "directory pmlname_img or images. This plugin is run every time you add a PML "
@@ -201,49 +201,49 @@ msgstr ""
 "nella cartella pmlname_img o in images. Questo plug-in è eseguito ogni volta "
 "che si aggiunge un documento PML alla biblioteca."
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:90
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:93
 msgid "Extract cover from comic files"
 msgstr "Estrae le copertine dai file dei fumetti"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:117
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:128
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:140
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:150
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:160
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:171
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:181
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:191
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:201
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:211
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:221
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:232
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:243
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:255
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:276
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:287
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:297
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:307
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:120
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:131
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:153
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:163
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:174
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:184
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:194
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:204
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:214
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:224
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:235
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:246
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:258
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:279
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:290
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:300
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:310
 msgid "Read metadata from %s files"
 msgstr "Leggi i metadati dai file %s"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:266
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:269
 msgid "Read metadata from ebooks in RAR archives"
 msgstr "Leggi i metadati dei libri negli archivi RAR"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:318
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:321
 msgid "Read metadata from ebooks in ZIP archives"
 msgstr "Leggi i metadati dei libri negli archivi ZIP"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:331
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:341
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:351
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:373
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:384
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:394
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:334
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:344
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:354
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:376
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:387
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:397
 msgid "Set metadata in %s files"
 msgstr "Imposta i metadati nei file %s"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:362
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:365
 msgid "Set metadata from %s files"
 msgstr "imposta metadati da %s file"
 
@@ -402,35 +402,35 @@ msgstr ""
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr "Questo profilo è adatto per il Kindle DX di Amazon."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:31
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
 msgid "Installed plugins"
 msgstr "Plugin installati"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:33
 msgid "Mapping for filetype plugins"
 msgstr "Individuare plugins per i tipi di file"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:33
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:34
 msgid "Local plugin customization"
 msgstr "Personalizzazione dei plug-in locali"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:34
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
 msgid "Disabled plugins"
 msgstr "Plugin disabilitati"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
 msgid "Enabled plugins"
 msgstr "Plugin attivati"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:83
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:84
 msgid "No valid plugin found in "
 msgstr "Nessun plug-in valido trovato in "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:460
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:468
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr "Inizializzazione del plugin %s fallita con messaggio:"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:493
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
 msgid ""
 "    %prog options\n"
 "\n"
@@ -442,17 +442,17 @@ msgstr ""
 "    Personalizza Calibre con l'utilizzo di plugin esterni\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:499
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr ""
 "Aggiunge un plug-in specificando il percorso al file zip che lo contiene."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 "Rimuovi un plugin personalizzato dal nome. Non ha effetto sui plugin inclusi"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:503
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:511
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
@@ -460,15 +460,15 @@ msgstr ""
 "Personalizza un plug-in. Specificare il nome del plug-in e la stringa di "
 "personalizzazione separati da una virgola."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:505
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:513
 msgid "List all installed plugins"
 msgstr "Elenca tutti i plug-in installati"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Enable the named plugin"
 msgstr "Abilita il plug-in"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Disable the named plugin"
 msgstr "Disabilita il plug-in"
 
@@ -626,7 +626,7 @@ msgstr "Comunica con i lettori Hanlin V5."
 msgid "Communicate with the BOOX eBook reader."
 msgstr "Comunica con i lettori BOOX."
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:121
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:123
 msgid ""
 "Comma separated list of directories to send e-books to on the device. The "
 "first one that exists will be used."
@@ -699,34 +699,34 @@ msgstr "Comunica con il Kobo Reader"
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:51
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:54
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:57
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:157
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:159
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:64
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:67
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:70
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:130
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:137
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:160
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:139
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:162
 msgid "Getting list of books on device..."
 msgstr "Recupero della lista dei libri sul dispositivo..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:218
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:258
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:244
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:262
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:219
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:263
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:246
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:264
 msgid "Removing books from device..."
 msgstr "Rimozione dei libri dal dispositivo..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:262
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:269
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:269
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:274
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:267
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:274
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:271
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:276
 msgid "Removing books from device metadata listing..."
 msgstr "Cancellazione libri dalla lista metadati del dispositivo..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:274
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:308
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:208
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:238
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:313
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:210
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:240
 msgid "Adding books to device metadata listing..."
 msgstr "Aggiunta dei libri alla lista metadati del dispositivo..."
 
@@ -742,6 +742,10 @@ msgstr "Comunica con il Booq Avant"
 msgid "Communicate with the Sweex MM300"
 msgstr "Comunica con il Sweex MM300"
 
+#: /home/kovid/work/calibre/src/calibre/devices/misc.py:75
+msgid "Communicate with the Pandigital Novel"
+msgstr "Comunica con il Pandigital Novel"
+
 #: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:17
 msgid "Communicate with the Nokia 770 internet tablet."
 msgstr "Comunica con il Nokia 770 Internet Tablet."
@@ -892,12 +896,12 @@ msgstr "Comunicare con un lettore di eBook."
 msgid "Get device information..."
 msgstr "Recupero informazioni del dispositivo..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:188
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:192
 msgid "Transferring books to device..."
 msgstr "Trasferimento dei libri nel dispositivo..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:305
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:307
 msgid "Sending metadata to device..."
 msgstr "Invio dei metadati al dispositivo..."
 
@@ -1203,8 +1207,7 @@ msgstr "Output salvato in"
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:95
 msgid "Level of verbosity. Specify multiple times for greater verbosity."
 msgstr ""
-"Livello di dettagli dell'output. Specificare piu' volte per maggiori "
-"dettagli."
+"Livello di dettagli dell'output. Specificare più volte per maggiori dettagli."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:102
 msgid ""
@@ -1250,9 +1253,9 @@ msgid ""
 msgstr ""
 "Dimensione base dei caratteri in punti. Tutte le dimensioni dei caratteri "
 "nel libro prodotto saranno scalate in base a questa dimensione. Scegliendo "
-"una dimensione maggiore si possono ottenere caratteri piu' grandi "
-"nell'output e viceversa. Per default, la dimensione base dei caratteri è "
-"scelta in base al profilo scelto."
+"una dimensione maggiore si possono ottenere caratteri più grandi nell'output "
+"e viceversa. Per default, la dimensione base dei caratteri è scelta in base "
+"al profilo scelto."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:143
 msgid ""
@@ -1677,6 +1680,59 @@ msgstr "Transcodifica di un ebook in corso..."
 msgid "Creating"
 msgstr "Creazione in corso"
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/__init__.py:18
+msgid "ePub Fixer"
+msgstr "ePub Fixer"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/epubcheck.py:18
+msgid "Workaround epubcheck bugs"
+msgstr "Soluzione ai bug di epubcheck"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/epubcheck.py:22
+msgid ""
+"Workarounds for bugs in the latest release of epubcheck. epubcheck reports "
+"many things as errors that are not actually errors. epub-fix will try to "
+"detect these and replace them with constructs that epubcheck likes. This may "
+"cause significant changes to your epub, complain to the epubcheck project."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:19
+msgid ""
+"%prog [options] file.epub\n"
+"\n"
+"Fix common problems in EPUB files that can cause them to be rejected by "
+"poorly designed publishing services.\n"
+"\n"
+"By default, no fixing is done and messages are printed out for each error "
+"detected. Use the options to control which errors are automatically fixed."
+msgstr ""
+"%prog [opzioni] file.epub\n"
+"\n"
+"Corregge i problemi comuni nei file EPUB che possono causarne il rifiuto dai "
+"dispositivi mal progettati.\n"
+"\n"
+"Di default, non viene effettuata alcuna correzione e vengono visualizzati i "
+"messaggi per ogni errore individuato. Usare le opzioni per controllare quali "
+"errori correggere automaticamente."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:50
+msgid "You must specify an epub file"
+msgstr "Specificare un file epub"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:17
+msgid "Fix unmanifested files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:21
+msgid ""
+"Fix unmanifested files. epub-fix can either add them to the manifest or "
+"delete them as specified by the delete unmanifested option."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:32
+msgid "Delete unmanifested files instead of adding them to the manifest"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:56
 msgid ""
 "Extract the contents of the generated EPUB file to the specified directory. "
@@ -2056,11 +2112,11 @@ msgstr "Comic"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:98
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:882
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:887
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:543
 msgid "Title"
 msgstr "Titolo"
@@ -2069,7 +2125,7 @@ msgstr "Titolo"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:364
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:883
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:888
 msgid "Author(s)"
 msgstr "Autore(i)"
 
@@ -2092,7 +2148,7 @@ msgstr "Produttore"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:67
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:318
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1073
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1079
 msgid "Comments"
 msgstr "Commenti"
 
@@ -2101,7 +2157,7 @@ msgstr "Commenti"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:306
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1069
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1075
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:139
 msgid "Tags"
 msgstr "Tag"
@@ -2111,7 +2167,7 @@ msgstr "Tag"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:323
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1084
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:87
 msgid "Series"
 msgstr "Serie"
@@ -2121,7 +2177,7 @@ msgid "Language"
 msgstr "Lingua"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:406
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1067
 msgid "Timestamp"
 msgstr "Timestamp"
 
@@ -2389,7 +2445,7 @@ msgstr ""
 "con da ISBN da LibraryThing.com\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1226
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1398
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1399
 msgid "Cover"
 msgstr "Copertina"
 
@@ -2431,70 +2487,70 @@ msgstr "Tutti gli articoli"
 msgid "This is an Amazon Topaz book. It cannot be processed."
 msgstr "Questo è un libro Amazon Topaz. Non può essere elaborato."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1399
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1400
 msgid "Title Page"
 msgstr "Pagina iniziale"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1400
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1401
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:15
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:53
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:194
 msgid "Table of Contents"
 msgstr "Indice"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1401
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1402
 msgid "Index"
 msgstr "Indice analitico"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1402
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1403
 msgid "Glossary"
 msgstr "Glossario"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1403
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1404
 msgid "Acknowledgements"
 msgstr "Ringraziamenti"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1404
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1405
 msgid "Bibliography"
 msgstr "Bibliografia"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1405
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1406
 msgid "Colophon"
 msgstr "Colophon"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1406
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1407
 msgid "Copyright"
 msgstr "Diritti d'autore"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1407
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1408
 msgid "Dedication"
 msgstr "Dedica"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1408
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1409
 msgid "Epigraph"
 msgstr "Epigrafe"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1409
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1410
 msgid "Foreword"
 msgstr "Premessa"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1410
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1411
 msgid "List of Illustrations"
 msgstr "Indice delle figure"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1411
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1412
 msgid "List of Tables"
 msgstr "Indice delle tabelle"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1412
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1413
 msgid "Notes"
 msgstr "Note"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1413
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1414
 msgid "Preface"
 msgstr "Prefazione"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1414
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1415
 msgid "Main Text"
 msgstr "Corpo del testo"
 
@@ -2542,7 +2598,7 @@ msgstr "Menu a lato"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:22
 #: /home/kovid/work/calibre/src/calibre/ebooks/tcr/input.py:23
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:23
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:24
 msgid ""
 "Normally calibre treats blank lines as paragraph markers. With this option "
 "it will assume that every line represents a paragraph instead."
@@ -2553,7 +2609,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:26
 #: /home/kovid/work/calibre/src/calibre/ebooks/tcr/input.py:27
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:27
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:28
 msgid ""
 "Normally calibre treats blank lines as paragraph markers. With this option "
 "it will assume that every line starting with an indent (either a tab or 2+ "
@@ -2725,7 +2781,7 @@ msgstr ""
 "Ottieni i dettagli del PDF.\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
 msgid "Author"
 msgstr "Autore"
@@ -2904,7 +2960,7 @@ msgstr ""
 "1 é il valore piu basso di compressione, ma il piú veloce, e 10 é il piú "
 "alto valore di compressione, ma il piú lento."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:33
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:34
 msgid ""
 "Normally extra spaces are condensed into a single space. With this option "
 "all spaces will be displayed."
@@ -2912,7 +2968,7 @@ msgstr ""
 "Normalmente gli spazi multipli vengono trasformati in uno unico. Con questa "
 "opzioni vergono visualizzati tutti gli spazi."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:36
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:37
 msgid ""
 "Run the text input through the markdown pre-processor. To learn more about "
 "markdown see"
@@ -2920,7 +2976,7 @@ msgstr ""
 "Analizzare il testo sorgente utilizzando il pre-processore markdown. Per "
 "maggiori informazioni su markdown vedere"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:39
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:40
 msgid "Do not insert a Table of Contents into the output text."
 msgstr "Non inserire un indice nel testo di output."
 
@@ -2978,11 +3034,11 @@ msgstr "Chiedi conferma prima di eliminare"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:37
 msgid "Toolbar icon size"
-msgstr "Dimensione bottoni nella barra degli strumenti"
+msgstr "Dimensione pulsanti nella barra degli strumenti"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:39
 msgid "Show button labels in the toolbar"
-msgstr "Mostra testo nei bottoni della barra degli strumenti"
+msgstr "Mostra testo dei pulsanti della barra degli strumenti"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:41
 msgid "Main window geometry"
@@ -3048,7 +3104,7 @@ msgid ""
 "Show the cover flow in a separate window instead of in the main calibre "
 "window"
 msgstr ""
-"Fai vedere la vetrina delle copertine in una finestra separata invece della "
+"Mostra la vetrina delle copertine in una finestra separata invece della "
 "finestra principale di Calibre."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:69
@@ -3106,7 +3162,7 @@ msgstr "Copia"
 msgid "Copy to Clipboard"
 msgstr "Copia negli appunti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:400
 msgid "Choose Files"
 msgstr "Seleziona documenti"
 
@@ -3121,13 +3177,13 @@ msgid "User annotations generated from main library only"
 msgstr "Annotazioni utente generate solo dalla biblioteca principale"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:75
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:612
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:671
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:708
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:729
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:877
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1060
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:670
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:707
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:728
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:876
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:941
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1059
 msgid "No books selected"
 msgstr "Nessun libro selezionato"
 
@@ -3167,143 +3223,143 @@ msgstr "Quanti libri vuoti?"
 msgid "How many empty books should be added?"
 msgstr "quanti libri vuoti si desidera aggiungere?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:340
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:390
 msgid "Uploading books to device."
 msgstr "Invio dei libri al dispositivo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:350
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:137
 msgid "Books"
 msgstr "Libri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
 msgid "EPUB Books"
 msgstr "Libri EPUB"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
 msgid "LRF Books"
 msgstr "Libri LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
 msgid "HTML Books"
 msgstr "Libri HTML"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
 msgid "LIT Books"
 msgstr "Libri LIT"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
 msgid "MOBI Books"
 msgstr "Libri MOBI"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
 msgid "Topaz books"
 msgstr "Libri Topaz"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
 msgid "Text books"
 msgstr "Libri TXT"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:359
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
 msgid "PDF Books"
 msgstr "Libri PDF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:359
 msgid "Comics"
 msgstr "Fumetti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:360
 msgid "Archives"
 msgstr "Archivi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:364
 msgid "Supported books"
 msgstr "Libri supportati"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:399
 msgid "Merged some books"
 msgstr "Uniti alcuni libri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:401
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:400
 msgid ""
 "Some duplicates were found and merged into the following existing books:"
 msgstr "Alcune copie sono state trovate e unite con i seguenti libri:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:409
 msgid "Failed to read metadata"
 msgstr "Non é stato possibile leggere i metadati"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:410
 msgid "Failed to read metadata from the following"
 msgstr "Non é stato possibile leggere i metadati dai seguenti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:434
 msgid "Add to library"
 msgstr "Aggiungi alla biblioteca"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:460
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1229
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:459
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1228
 msgid "No book selected"
 msgstr "Nessun libro selezionato"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:434
 msgid "No book files found"
 msgstr "Nessun libro trovato"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:456
 msgid "Cannot delete"
 msgstr "Non si può cancellare"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:469
 msgid "Choose formats to be deleted"
 msgstr "Seleziona i formati da cancellare"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:488
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:487
 msgid "Choose formats <b>not</b> to be deleted"
 msgstr "Seleziona i formati da <b>non</b> cancellare"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:507
 msgid "Cannot delete books"
 msgstr "Impossibile eliminare i libri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:509
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:508
 msgid "No device is connected"
 msgstr "Nessun dispositivo collegato"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:519
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:518
 msgid "Main memory"
 msgstr "Memoria principale"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:520
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:444
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:519
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:454
 msgid "Storage Card A"
 msgstr "Scheda di memoria A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:521
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:446
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:455
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:447
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:456
 msgid "Storage Card B"
 msgstr "Scheda di memoria B"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:525
 msgid "No books to delete"
 msgstr "Nessun libro da eliminare"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:526
 msgid "None of the selected books are on the device"
 msgstr "Nessuno dei libri selezionati è sul device"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:544
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:600
 msgid "Deleting books from device."
 msgstr "Cancellazione dei libri dal dispositivo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:564
 msgid ""
 "The selected books will be <b>permanently deleted</b> and the files removed "
 "from your computer. Are you sure?"
@@ -3311,7 +3367,7 @@ msgstr ""
 "I libri selezionati saranno <b>cancellati permanentemente</b> e i documenti "
 "rimossi dal computer. Siete sicuri?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:585
 msgid ""
 "The selected books will be <b>permanently deleted</b> from your device. Are "
 "you sure?"
@@ -3319,61 +3375,61 @@ msgstr ""
 "I libri selezionati verranno <b>cancellati definitivamente</p> dal "
 "dispositivo. Confermare?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:610
 msgid "Cannot download metadata"
 msgstr "Impossibile scaricare i metadati"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:627
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
 msgid "social metadata"
 msgstr "metadati sociali"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
 msgid "covers"
 msgstr "copertine"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
 msgid "metadata"
 msgstr "metadati"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:630
 msgid "Downloading %s for %d book(s)"
 msgstr "Scaricamento %s per %d libro"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:654
 msgid "Failed to download some metadata"
 msgstr "Impossibile scaricare alcuni metadati"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:656
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
 msgid "Failed to download metadata for the following:"
 msgstr "Impossibile a scaricare i metadati per i seguenti:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:659
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:658
 msgid "Failed to download metadata:"
 msgstr "Lo scaricamento dei metadati è fallito:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:660
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:637
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:522
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:949
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:659
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:638
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:951
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
 msgid "Error"
 msgstr "Errore"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:670
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:707
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:669
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:706
 msgid "Cannot edit metadata"
 msgstr "Impossibile modificare i metadati"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:728
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:731
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:727
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:730
 msgid "Cannot merge books"
 msgstr "Impossibile unire i libri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:732
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:731
 msgid "At least two books must be selected for merging"
 msgstr "Devono essere selezionati almeno due libri per essere uniti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:736
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:735
 msgid ""
 "All book formats and metadata from the selected books will be added to the "
 "<b>first selected book.</b><br><br> The second and subsequently selected "
@@ -3384,7 +3440,7 @@ msgstr ""
 "<b>primo libro selezionato</b>.<br><br> Gli altri libri non verranno "
 "cancellati o modificati.<br><br>Procedere con l'operazione?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:747
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:746
 msgid ""
 "All book formats and metadata from the selected books will be merged into "
 "the <b>first selected book</b>.<br><br>After merger the second and "
@@ -3400,51 +3456,51 @@ msgstr ""
 "verrà<b>permantentemente cancellato</b> dal computer.<br><br>Procedere "
 "l'operazione?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:759
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:758
 msgid ""
 "You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
 "proceed?"
 msgstr "Verranno uniti più di 5 libri. <b>Confermare l'unione</b>?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:876
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:875
 msgid "Cannot save to disk"
 msgstr "Impossibile salvare sul disco"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:878
 msgid "Choose destination directory"
 msgstr "Scegliere la cartella di destinazione"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:912
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:911
 msgid "Error while saving"
 msgstr "Errore durante il salvataggio"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:913
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:912
 msgid "There was an error while saving."
 msgstr "Si è verificato un errore durante il salvataggio."
 
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:919
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:920
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:921
 msgid "Could not save some books"
 msgstr "Non é stato possibile salvare tutti i libri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:922
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:921
 msgid "Click the show details button to see which ones."
 msgstr "Fare clic sul pulsante dettagli per vedere quali."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
 msgid "No books selected to generate catalog for"
 msgstr "Nessun libro selezionato per la generazione del catalogo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:960
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:959
 msgid "Generating %s catalog..."
 msgstr "Generando %s catalogo..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:965
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:964
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:264
 msgid "No books found"
 msgstr "Nessun libro trovato"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:966
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:965
 msgid ""
 "No books to catalog\n"
 "Check exclude tags"
@@ -3452,49 +3508,49 @@ msgstr ""
 "Nessun libro da catalogare\n"
 "Controlla i tag esclusi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:976
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:975
 msgid "Catalog generated."
 msgstr "Catalogo generato"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:979
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:978
 msgid "Export Catalog Directory"
 msgstr "Esporta il catalogo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:980
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:979
 msgid "Select destination for %s.%s"
 msgstr "Selezionare una destinazione per %s.%s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:996
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:995
 msgid "Fetching news from "
 msgstr "Recupero notizie da "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1009
 msgid " fetched."
 msgstr " preso."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1059
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1058
 msgid "Cannot convert"
 msgstr "Impossibile convertire"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1088
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1087
 msgid "Starting conversion of %d book(s)"
 msgstr "Conversione di %d libri avviata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1265
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1264
 msgid "Cannot view"
 msgstr "Impossibile leggere"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1209
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
 msgid "Choose the format to view"
 msgstr "Scegliere il formato da leggere"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1218
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1217
 msgid "Multiple Books Selected"
 msgstr "Piú di un libro selezionato"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1219
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1218
 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 "
@@ -3506,11 +3562,11 @@ msgstr ""
 "vostro computer. Una volta cominciato questa azione non puó essere fermata "
 "finché il processo é completato. Siete sicuri di voler continuare?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1227
 msgid "Cannot open folder"
 msgstr "Impossibile aprire la cartella"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1266
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1265
 msgid "%s has no available formats."
 msgstr "%s non ha formati disponibili"
 
@@ -3535,7 +3591,7 @@ msgid "The specified directory could not be processed."
 msgstr "Impossibile elaborare la cartella indicata."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:845
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr "Nessun libro."
 
@@ -3553,7 +3609,7 @@ msgid ""
 "the books in smaller increments, until you find the problem book."
 msgstr ""
 "Sembra che la procedura per aggiungere libri si sia bloccata. Si consiglia "
-"di far ripartire Calibre e aggiungere i libri in incrementi piu' piccoli, "
+"di far ripartire Calibre e aggiungere i libri in incrementi più piccoli, "
 "fino a quando si indentifica il libro che causa il problema."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:356
@@ -3674,15 +3730,15 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:52
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:633
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:637
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:366
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:371
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:385
@@ -3706,12 +3762,12 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:259
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:265
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:186
@@ -3744,8 +3800,9 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:313
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1059
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1065
 msgid "Path"
 msgstr "Percorso"
 
@@ -3762,8 +3819,8 @@ msgid "Formats"
 msgstr "Formati"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:25
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:886
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1062
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:891
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1068
 msgid "Collections"
 msgstr "Raccolte"
 
@@ -3776,12 +3833,12 @@ msgstr "Fare clic per aprire"
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:305
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:311
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:317
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1068
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1072
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1074
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:458
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:274
 msgid "None"
 msgstr "Nessuno"
 
@@ -4675,12 +4732,12 @@ msgid "Footer regular expression:"
 msgstr "Espressione regolare per il piè di pagina."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:56
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:76
 msgid "Invalid regular expression"
 msgstr "Espressione regolare non valida"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:77
 msgid "Invalid regular expression: %s"
 msgstr "Espressione regolare non valida: %s"
 
@@ -4903,11 +4960,11 @@ msgstr ""
 "XPath consultare il <a href=\"http://calibre-"
 "ebook.com/user_manual/xpath.html\">Tutorial di XPath</a>."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:127
 msgid "Cover browser could not be loaded"
 msgstr "Impossibile caricare il browser di copertine"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:179
 msgid "Browse by covers"
 msgstr "Sfoglia per copertine"
 
@@ -4966,124 +5023,124 @@ msgstr "tag da aggiungere"
 msgid "tags to remove"
 msgstr "tag da eliminare"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:49
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:135
 msgid "No details available."
 msgstr "Nessun dettaglio disponibile."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:155
 msgid "Device no longer connected."
 msgstr "Dispositivo non più collegato."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:270
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:271
 msgid "Get device information"
 msgstr "Recupera informazioni sul dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:282
 msgid "Get list of books on device"
 msgstr "Recupera la lista dei libri del dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:292
 msgid "Get annotations from device"
 msgstr "Ricevi annotazioni dal dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:301
 msgid "Send metadata to device"
 msgstr "Invia metadati al dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:305
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:306
 msgid "Send collections to device"
 msgstr "Invia collezioni al dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:330
 msgid "Upload %d books to device"
 msgstr "Invia %d libri al dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:345
 msgid "Delete books from device"
 msgstr "Cancella i libri dal dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:362
 msgid "Download books from device"
 msgstr "Scarica libri dal dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:372
 msgid "View book on device"
 msgstr "Visualizza libro sul dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:408
 msgid "Set default send to device action"
 msgstr "Imposta azione predefinita di invio"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:413
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:420
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:422
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:425
 msgid "Email to"
 msgstr "Invia messaggio elettronico a"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:425
 msgid " and delete from library"
 msgstr " ed elimina dalla biblioteca"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:434
 msgid "Send to main memory"
 msgstr "Invia alla memoria principale"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:436
 msgid "Send to storage card A"
 msgstr "Invia alla scheda di memoria A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:437
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:438
 msgid "Send to storage card B"
 msgstr "Invia alla scheda di memoria B"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:442
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:452
 msgid "Main Memory"
 msgstr "Memoria principale"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:469
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:470
 msgid "Send and delete from library"
 msgstr "Invia ed elimina dalla biblioteca"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:471
 msgid "Send specific format"
 msgstr "Invia uno specifico formato"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:509
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:510
 msgid "Connect to folder"
 msgstr "Connetti alla cartella"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:516
 msgid "Connect to iTunes"
 msgstr "Connetti ad iTunes"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:521
 msgid "Eject device"
 msgstr "Espelli dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:529
 msgid "Fetch annotations (experimental)"
 msgstr "Preleva annotazioni (sperimentale)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:638
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:639
 msgid "Error communicating with device"
 msgstr "Errore di comunicazione col dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:659
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:660
 msgid "Select folder to open as device"
 msgstr "Selezionare la cartella da aprire come dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:704
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:705
 msgid "Failed"
 msgstr "Fallito"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:710
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:711
 msgid "Error talking to device"
 msgstr "Errore di comunicazione col dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:711
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:712
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -5091,127 +5148,123 @@ 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/device.py:753
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:754
 msgid "Device: "
 msgstr "Dispositivo: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:755
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:756
 msgid " detected."
 msgstr " individuato."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:778
-msgid "Connected "
-msgstr "Connesso "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:846
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr "Selezione per l'invio"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:851
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:847
 msgid "Choose format to send to device"
 msgstr "Selezionare il formato da inviare al dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:860
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:856
 msgid "No device"
 msgstr "Nessun dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:857
 msgid "Cannot send: No device is connected"
 msgstr "Impossibile inviare: nessun dispositivo connesso"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:860
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:868
 msgid "No card"
 msgstr "Nessuna scheda"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:869
 msgid "Cannot send: Device has no storage card"
 msgstr "Impossibile inviare: il dispositivo non ha schede di memoria"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:910
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:906
 msgid "E-book:"
 msgstr "Libro elettronico"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:913
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:909
 msgid "Attached, you will find the e-book"
 msgstr "Troverete allegato il libro elettronico"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:910
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:181
 msgid "by"
 msgstr "di"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:915
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:911
 msgid "in the %s format."
 msgstr "nel formato %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:928
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:924
 msgid "Sending email to"
 msgstr "Spedizione di un messaggio elettronico a"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:958
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:965
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1057
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1118
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1236
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:954
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:962
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1054
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1235
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:1243
 msgid "No suitable formats"
 msgstr "Nessun formato adatto"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:959
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:955
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 "Convertire automaticamente i libri selezionati prima di inviare con posta "
 "eletrronica?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:966
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:963
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 "Non é stato possibile inviare ilibri indicati via posta elettronica poiché "
 "non sono stati trovati formati adatti:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:984
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:981
 msgid "Failed to email books"
 msgstr "Non é stato possibile inviare dei libri via posta elettronica"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:985
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:982
 msgid "Failed to email the following books:"
 msgstr "Non é stato possibile inviare via posta elettronica questi libri:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:989
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:986
 msgid "Sent by email:"
 msgstr "Inviato per posta elettronica"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1016
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1013
 msgid "News:"
 msgstr "Notizie:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1017
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1014
 msgid "Attached is the"
 msgstr "Allegato c'é"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1028
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1025
 msgid "Sent news to"
 msgstr "Notizie inviate a"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1058
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1237
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1055
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1117
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1236
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 "Convertire automaticamente i libri seguenti prima di inviarli al dispositivo?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1087
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1085
 msgid "Sending catalogs to device."
 msgstr "Inviando i cataloghi al dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1150
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1149
 msgid "Sending news to device."
 msgstr "Invio delle notizie al dispositivo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1202
 msgid "Sending books to device."
 msgstr "Invio dei libri al dispositivo."
 
@@ -5269,7 +5322,7 @@ msgid "My Books"
 msgstr "I miei libri"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:69
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:289
 msgid "Generate catalog"
 msgstr "Crea catalogo"
 
@@ -5414,11 +5467,11 @@ msgstr "Largo"
 msgid "Narrow"
 msgstr "Stretto"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:503
 msgid "System port selected"
 msgstr "Porta di sistema selezionata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:503
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:504
 msgid ""
 "The value <b>%d</b> you have chosen for the content server port is a system "
 "port. Your operating system <b>may</b> not allow the server to run on this "
@@ -5429,134 +5482,134 @@ msgstr ""
 "server di funzionare su questa porta. Per essere sicuri selezionare un "
 "numero di porta maggiore di 1024."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:524
 msgid "Failed to install command line tools."
 msgstr ""
 "Non é stato possibile installare gli strumenti per i comandi di linea."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:527
 msgid "Command line tools installed"
 msgstr "Strumenti per i comandi di linea installati"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:528
 msgid "Command line tools installed in"
 msgstr "Strumenti per i comandi di linea installati in"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:529
 msgid ""
 "If you move calibre.app, you have to re-install the command line tools."
 msgstr ""
 "Se muovete calibre.app, sará necessario reinstallare anche gli strumenti per "
 "i comandi di linea."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:580
 msgid "No valid plugin path"
 msgstr "Percorso del plugin non valido"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:581
 msgid "%s is not a valid plugin path"
 msgstr "%s non é un percorso di plugin valido"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:584
 msgid "Choose plugin"
 msgstr "Selezionare plugin"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:596
 msgid "Plugin cannot be disabled"
 msgstr "Il plugin non puó essere disattivato"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:597
 msgid "The plugin: %s cannot be disabled"
 msgstr "il plugin: %s non puó essere disattivato"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:606
 msgid "Plugin not customizable"
 msgstr "Plugin non personalizzabile"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:607
 msgid "Plugin: %s does not need customization"
 msgstr "Plugin: %s non richiede personalizzazione"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:615
 msgid "Customize"
 msgstr "Personalizzazione"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:652
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:653
 msgid "Cannot remove builtin plugin"
 msgstr "Impossibile rimuovere un plugin incorporato"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:653
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:654
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 " Impossibile rimuoverlo. Questo é un plugin incorporato. Provate invece a "
 "disattivarlo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:684
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:685
 msgid "You must select a column to delete it"
 msgstr "Selezionare una colonna da eliminare"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:690
 msgid "The selected column is not a custom column"
 msgstr "La colonna selezionata non è una colonna personalizzata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:690
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:691
 #: /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/config/__init__.py:691
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:692
 msgid "Do you really want to delete column %s and all its data?"
 msgstr "Eliminare veramente la colonna %s e tutti i sui dati?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:758
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:759
 msgid "Error log:"
 msgstr "File di log degli errori:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:765
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:766
 msgid "Access log:"
 msgstr "File di log degli accessi:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:793
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:794
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:331
 msgid "Failed to start content server"
 msgstr "Avvio del server dei contenuti fallito"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:817
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:818
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:587
 msgid "Select location for books"
 msgstr "Selezionare un percorso per i libri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:824
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:825
 msgid "Invalid size"
 msgstr "Dimensione non valida"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:825
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:826
 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/__init__.py:884
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:889
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:891
 msgid "Invalid database location"
 msgstr "Percorso database non valido"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:885
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:887
 msgid "Invalid database location "
 msgstr "Percorso database non valido "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:888
 msgid "<br>Must be a directory."
 msgstr "<br>Deve essere una cartella"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:890
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:892
 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/__init__.py:895
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:897
 msgid "Must restart"
 msgstr "Necessario riavviare"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:896
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:898
 msgid ""
 "The changes you made require that Calibre be restarted. Please restart as "
 "soon as practical."
@@ -5564,19 +5617,19 @@ msgstr ""
 "Le modifiche effettuate richiedono il riavvio di Calibre. Riavviare il prima "
 "possibile."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:930
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:932
 msgid "Checking database integrity"
 msgstr "Controllo dell'integritá del database."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:950
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:952
 msgid "Failed to check database integrity"
 msgstr "Controllo dell'integritá del database fallito."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:957
 msgid "Some inconsistencies found"
 msgstr "Sono stati trovati problemi di consistenza"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:956
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:958
 msgid ""
 "The following books had formats listed in the database that are not actually "
 "available. The entries for the formats have been removed. You should check "
@@ -5588,11 +5641,11 @@ msgstr ""
 "controllarli manualmente. Questo problema puó sorgere se i documenti nella "
 "cartella della biblioteca vengono modificati direttamente."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:133
 msgid "TabWidget"
 msgstr "Assistente per i TAB"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:134
 msgid ""
 "Here you can control how calibre will read metadata from the files you add "
 "to it. calibre can either read metadata from the contents of the file, or "
@@ -5602,11 +5655,11 @@ msgstr ""
 "vengono aggiunti. Calibre puó leggere i metadati sia dal contenuto dei "
 "documenti che dai nomi dei documenti."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:135
 msgid "Read metadata only from &file name"
 msgstr "Leggi i metadati solo dal nome del &file"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:136
 msgid ""
 "Swap the firstname and lastname of the author. This affects only metadata "
 "read from file names."
@@ -5614,11 +5667,11 @@ msgstr ""
 "Inverti nome e cognome dell'autore. Questo influisce esclusivamente sui "
 "metadati letti dai nomi dei files."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:137
 msgid "&Swap author firstname and lastname"
 msgstr "&Inverti i nomi e i cognomi dell'autore"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:138
 msgid ""
 "If an existing book with a similar title and author is found that does not "
 "have the format being added, the format is added\n"
@@ -5636,7 +5689,7 @@ msgstr ""
 "Il contronto del titolo ignora gli articoli (\"il\", \"un\", \"una\"), la "
 "punteggiatura, la dimensione, ecc. L'autore viene confrontato interamente."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:142
 msgid ""
 "If books with similar titles and authors found, &merge the new files "
 "automatically"
@@ -5644,15 +5697,15 @@ msgstr ""
 "Se vengono trovati libri con titoli e autori simili, &unisci i nuovi file "
 "automaticamente"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:143
 msgid "&Configure metadata from file name"
 msgstr "&Configura i metadati dal nome del documento"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:144
 msgid "&Adding books"
 msgstr "&Aggiunta libri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:145
 msgid ""
 "Here you can control how calibre will save your books when you click the "
 "Save to Disk button:"
@@ -5660,66 +5713,79 @@ msgstr ""
 "Qui é possibile controllare come Calibre salva i tuoi libri quando si selezi "
 "il comando Salva sul disco:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:146
 msgid "Save &cover separately"
 msgstr "Salva la &copertina separatamente"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:147
 msgid "Update &metadata in saved copies"
 msgstr "Aggiorna &metadati nelle copie salvate"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:148
 msgid "Save metadata in &OPF file"
 msgstr "Salva i metadati nei file &OPF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:149
 msgid "Convert non-English characters to &English equivalents"
 msgstr ""
 "Conversione dei caratteri non anglofoni nei loro corrispondenti &inglesi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:150
 msgid "Format &dates as:"
 msgstr "Formattato &date:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:151
 msgid "File &formats to save:"
 msgstr "&Formato dei documenti da salvare:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:152
 msgid "Replace space with &underscores"
 msgstr "Sostituire gli spazi con &sottolineature"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:153
 msgid "Change paths to &lowercase"
 msgstr "Cambiare percorsi in &minuscolo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:154
 msgid "&Saving books"
 msgstr "&Salvataggio libri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:135
-msgid "Preserve device collections."
-msgstr "Conserva le collezioni del dispositivo."
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:155
+msgid "Metadata &management:"
+msgstr "Gestione &metadati:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:156
+msgid "Manual management"
+msgstr "Gestione manuale"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:157
+msgid "Only on send"
+msgstr "Solo all'invio"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:158
+msgid "Automatic management"
+msgstr "Gestione automatica"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:159
 msgid ""
-"If checked, collections will not be deleted even if a book with changed "
-"metadata is resent and the collection is not in the book's metadata. In "
-"addition, editing collections in the device view will be enabled. If "
-"unchecked, collections will be always reflect only the metadata in the "
-"calibre library."
+"<li><b>Manual Management</b>: Calibre updates the metadata and adds "
+"collections only when a book is sent. With this option, calibre will never "
+"remove a collection.</li>\n"
+"<li><b>Only on send</b>: Calibre updates metadata and adds/removes "
+"collections for a book only when it is sent to the device. </li>\n"
+"<li><b>Automatic management</b>: Calibre automatically keeps metadata on the "
+"device in sync with the calibre library, on every connect</li></ul>"
 msgstr ""
-"Se attivo, le collezioni non verranno eliminate anche se un libro con i "
-"metadati cambiati viene inviato e la collezione non è tra i metadati del "
-"libro. In più, viene abilitata la modifica delle collezioni nel dispositivo. "
-"Se disattivato, le collezioni rifletteranno sempre e solo i metadati nella "
-"biblioteca di calibre."
+"<li><b>Gestione manuale</b>: Calibre aggiorna i metadati e aggiunge le "
+"collezioni solo quando un libro viene inviato. Con questa opzione, calibre "
+"non eliminerà mai una collezione.</li>\n"
+"<li><b>Solo all'inivio</b>: Calibre aggiorna i metadati e aggiunge/rimuove "
+"collezioni per un libro solo quando viene inviato al dispositivo. </li>\n"
+"<li><b>Gestione automatica</b>: Calibre mantiene automaticamente "
+"sincronizzati i metadata sul dispositivo con la biblioteca di calibre ad "
+"ogni collegamento</li></ul>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:137
-msgid "  "
-msgstr "  "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:162
 msgid ""
 "Here you can control how calibre will save your books when you click the "
 "Send to Device button. This setting can be overriden for individual devices "
@@ -5730,18 +5796,19 @@ msgstr ""
 "sovrascritte per ogni dispositivo personalizzando il plugin di controllo dei "
 "dispositivi in Preferenze->Plugins"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:163
 msgid "Sending to &device"
 msgstr "Invio al &dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:167
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:174
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr "Preferenze"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
@@ -5749,27 +5816,27 @@ 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/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
 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/config_ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
 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/config_ui.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
 msgid "Download &social metadata (tags/ratings/etc.) by default"
 msgstr "Scarica i metadati &sociali (tag, valutazioni, etc.) automaticamente"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
 msgid "&Overwrite author and title by default when fetching metadata"
 msgstr "&Sovrascrivi autore e titolo quando si scaricano i metadati"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
 msgid "Default network &timeout:"
 msgstr "&Timeout predefinito della rete:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
@@ -5777,156 +5844,160 @@ 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/config_ui.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
 msgid " seconds"
 msgstr " secondi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
 msgid "Choose &language (requires restart):"
-msgstr "Ling&ua (richiede il riavvio):"
+msgstr "Ling&ua (richiede riavvio):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
 msgid "Normal"
 msgstr "Normale"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
 msgid "High"
 msgstr "Massima"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
 msgid "Low"
 msgstr "Minima"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
 msgid "Job &priority:"
 msgstr "&Priorità dei lavori:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
 msgid "Preferred &output format:"
 msgstr "Formato preferito per l'&output:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
 msgid "Preferred &input format order:"
 msgstr "Ordine dei formati preferiti per l'&input:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
 msgid "Use &Roman numerals for series number"
 msgstr "&Usa numeri romani per i numeri di serie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
 msgid "Enable system &tray icon (needs restart)"
-msgstr "Abilita l'icona nel vassoio di sistema (richiede il riavvio)"
+msgstr "Abilita l'icona nel vassoio di sistema (richiede riavvio)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
 msgid "Show &notifications in system tray"
-msgstr "Visualizza le &notifiche nella barra di sistema."
+msgstr "Visualizza le &notifiche nella barra di sistema"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
 msgid "Show &splash screen at startup"
 msgstr "Visualizza lo &splash screen all'avvio"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 "Visualizza il &browser di copertine in una finestra separata (richiede "
 "riavvio)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
 msgid "Show &average ratings in the tags browser"
 msgstr "Visualizza la &media delle valutazioni nel browser dei tag"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
 msgid "Search as you type"
 msgstr "Cerca mentre si scrive"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
 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/config_ui.py:578
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
 msgid "&Delete news from library when it is automatically sent to reader"
 msgstr ""
 "&Rimuovi le notizie dalla biblioteca dopo averle inviate automaticamente al "
 "dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 "&Numero di copertine da visualizzare in modalitá sfoglia (richiede riavvio):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
 msgid "Toolbar"
 msgstr "Barra degli strumenti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
 msgid "Large"
 msgstr "Grande"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
 msgid "Medium"
 msgstr "Media"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
 msgid "Small"
 msgstr "Piccola"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
 msgid "&Button size in toolbar"
 msgstr "&Dimensione dei pulsanti nella barra degli strumenti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
 msgid "Show &text in toolbar buttons"
-msgstr "&Mostra testo nei bottoni della barra degli strumenti"
+msgstr "&Mostra testo nei pulsanti della barra degli strumenti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
 msgid "Select visible &columns in library view"
 msgstr "&Selezionare le colonne visibili nella vista biblioteca"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
 msgid "Remove a user-defined column"
 msgstr "Elimina una colonna personalizzata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
 msgid "Add a user-defined column"
 msgstr "Aggiungi una colonna personalizzata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
 msgid "Edit settings of a user-defined column"
 msgstr "Modifica le opzioni di una colonna personalizzata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
 msgid "Use internal &viewer for:"
 msgstr "Utilizza il &visualizzatore interno per:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
 msgid "User Interface &layout (needs restart):"
 msgstr "&Aspetto interfaccia grafica (richiede riavvio):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr "Disattiva tutte le animazioni. Utile per i computer più lenti."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
 msgid "Disable &animations"
 msgstr "Disattiva &animazioni"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
+msgid "Show &donate button (restart)"
+msgstr "Mostra pulsante &donazioni (richiede riavvio)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
 msgid "Add an email address to which to send books"
 msgstr "Aggiungi un indirizzo di posta elettronica a cui inviare i libri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
 msgid "&Add email"
 msgstr "&Aggiungi email"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
 msgid "Make &default"
 msgstr "Crea &default"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
 msgid "&Remove email"
 msgstr "&Elimina email"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
 msgid ""
 "calibre can send your books to you (or your reader) by email. Emails will be "
 "automatically sent for downloaded news to all email addresses that have Auto-"
@@ -5936,33 +6007,33 @@ msgstr ""
 "email saranno automaticamente inviate per ogni notizia scaricata a tutti gli "
 "indirizzi email a cui hai abilitato l'invio automatico"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
 msgid "&Maximum number of waiting worker processes (needs restart):"
 msgstr "Numero &massimo di processi in attesa (richiede riavvio):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
 msgid "&Check database integrity"
 msgstr "&Controllo dell'integritá del database"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
 msgid "&Install command line tools"
 msgstr "&Installa gli strumenti per i comandi di linea"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
 msgid "Open calibre &configuration directory"
 msgstr "Apri la cartella per la &configurazione di Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
 msgid "Limit the max. simultaneous jobs to the available CPU &cores"
 msgstr ""
 "Limita il massimo numero di job simultanei al numero dei &processori "
 "disponibili"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
 msgid "Debug &device detection"
 msgstr "&Debug e riconoscimento dei dispositivi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
 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 "
@@ -5972,25 +6043,25 @@ msgstr ""
 "usando un browser in qualunque parte del mondo. Qualsiasi cambiamento nella "
 "configurazione verrà attivato solo dopo il riavvio del server."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
 msgid "Server &port:"
 msgstr "&Porta del server:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:212
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:117
 msgid "&Username:"
 msgstr "&Nome utente:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:213
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:119
 msgid "&Password:"
 msgstr "&Password:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
@@ -5998,7 +6069,7 @@ 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/config_ui.py:615
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
@@ -6006,45 +6077,45 @@ msgstr ""
 "La dimensione massima (larghezzaxaltezza) per le copertine visualizzate. Le "
 "copertine più larghe vengono ridimensionate. "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
 msgid "Max. &cover size:"
 msgstr "Dimensi&one massima copertina:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:621
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:214
 msgid "&Show password"
 msgstr "&Mostra password"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
 msgid "Max. &OPDS items per query:"
 msgstr "Massimo elementi &OPDS per richiesta:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
 msgid "Max. OPDS &ungrouped items:"
 msgstr "Elementi OPDS &sparsi massimi:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
 msgid "&Start Server"
 msgstr "A&vvia il server"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:621
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
 msgid "St&op Server"
 msgstr "&Ferma il server"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:626
 msgid "&Test Server"
 msgstr "&Test sul server"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
 msgid "Run server &automatically on startup"
 msgstr "Avvia a&utomaticamente il server all'apertura"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:628
 msgid "View &server logs"
 msgstr "Visualizza i file di l&og del server"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:46
 msgid ""
 "<p>Remember to leave calibre running as the server only runs as long as "
@@ -6061,7 +6132,7 @@ msgstr ""
 "un nuovo catalogo sul tuo iPhone. In questo caso myhostname é da intendersi "
 "come il valore IP appropriato del computer su cui Calibre é attivo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:631
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
@@ -6069,27 +6140,27 @@ msgstr ""
 "Qui è possibile personalizzare le funzioni di Calibre modificando quali "
 "plugin sono usati dal programma."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:628
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:632
 msgid "Enable/&Disable plugin"
 msgstr "Attivare/&Disattiva il plugin"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:633
 msgid "&Customize plugin"
 msgstr "&Configura il plugin"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:630
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:634
 msgid "&Remove plugin"
 msgstr "&Rimuovi il plugin"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:635
 msgid "Add new plugin"
 msgstr "Aggiungi un nuovo plugin"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:632
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:636
 msgid "Plugin &file:"
 msgstr "Plugin &file:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:634
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:638
 msgid "&Add"
 msgstr "&Aggiungi"
 
@@ -6127,9 +6198,9 @@ msgstr "Numero"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:31
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:884
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:889
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Date"
 msgstr "Data"
@@ -6340,12 +6411,20 @@ msgstr "&Visualizza ancora questa avvertenza"
 msgid "ERROR"
 msgstr "ERRORE"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:67
+msgid ""
+"All checked books will be <b>permanently deleted</b> from your device. "
+"Please verify the list."
+msgstr ""
+"Tutti i libri selezionati verranno <b>definitivamente eliminati</b> dal "
+"dispositivo. Controllare la lista."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 msgid "Location"
 msgstr "Posizione"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1058
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1064
 msgid "Format"
 msgstr "Formato"
 
@@ -6848,7 +6927,7 @@ msgstr "Ultimo scaricamento"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:216
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:192
 msgid "Schedule news download"
-msgstr "Programmare lo scaricamento delle notizie"
+msgstr "Programma lo scaricamento delle notizie"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:219
 msgid "Add a custom news source"
@@ -6864,7 +6943,7 @@ msgstr "Nessuna connessione internet"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:322
 msgid "Cannot download news as no internet connection is active"
-msgstr "Impossibile scaricare le notizie perchè la connessione non è attiva"
+msgstr "Impossibile scaricare le notizie perché la connessione non è attiva"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:193
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:278
@@ -7193,6 +7272,10 @@ msgstr ""
 msgid "Add tag to available tags and apply it to current book"
 msgstr "Aggiungi il tag a quelli disponibili e applicalo al libro corrente"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:20
+msgid "%s (was %s)"
+msgstr "%s (era %s)"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:501
 msgid "Item is blank"
@@ -7520,11 +7603,11 @@ msgstr "Espressione regolare (?P&lt;title&gt;)"
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:88
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:93
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:98
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:100
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:99
 msgid "No match"
 msgstr "Nessuna corrispondenza"
 
@@ -7564,151 +7647,168 @@ msgstr "Espressione regolare (?P<isbn>)"
 msgid "Save single format to disk..."
 msgstr "Salvataggio di formato individuale sul disco..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:53
 msgid "Edit metadata individually"
 msgstr "Modifica metadati individualmente"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:56
 msgid "Edit metadata in bulk"
 msgstr "Modifica metadati in gruppo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:59
 msgid "Download metadata and covers"
 msgstr "Scarica i metadati e le copertine"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:62
 msgid "Download only metadata"
 msgstr "Scarica solo i metadati"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:64
 msgid "Download only covers"
 msgstr "Scarica solo le copertine"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:67
 msgid "Download only social metadata"
 msgstr "Scarica solo i metadati sociali"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:73
 msgid "Merge into first selected book - delete others"
 msgstr "Unisci nel primo libro selezionato - elimina gli altri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:76
 msgid "Merge into first selected book - keep others"
 msgstr "Unisci nel primo libro selezionato - mantieni gli altri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:84
 msgid "Add books from a single directory"
 msgstr "Aggiungi libri da una singola cartella"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:86
 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 ""
 "Aggiungi libri da cartelle includendo le sotto-cartelle (Un libro per "
-"cartella, si assume che ogni documento di libro elettronico é lo stesso "
-"libro in formati differenti)."
+"cartella, si assume che ebook sia lo stesso libro in formati differenti)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:90
 msgid ""
 "Add books from directories, including sub directories (Multiple books per "
 "directory, assumes every ebook file is a different book)"
 msgstr ""
-"Aggiungi libri da cartelle includendo le sotto-cartelle (Piú di un libro per "
-"cartella, si assume che ogni documento di libro elettronico é differente)."
+"Aggiungi libri da cartelle includendo le sotto-cartelle (Piú libri per "
+"cartella, si assume che ogni ebook sia un libro differente)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:93
 msgid "Add Empty book. (Book entry with no formats)"
 msgstr "Aggiungi un libro vuoto (Libro senza formati iniziali)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:102
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:160
 msgid "Save to disk"
 msgstr "Salva su disco"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Save to disk in a single directory"
 msgstr "Salva su disco in una singola cartella"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:106
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:402
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:393
 msgid "Save only %s format to disk"
 msgstr "Salva sul disco solo il formato %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:110
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:396
 msgid "Save only %s format to disk in a single directory"
 msgstr "Salva solo il formato %s su disco in una cartella unica"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:119
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:166
 msgid "View"
 msgstr "Leggi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:121
 msgid "View specific format"
 msgstr "Leggi uno specifico formato"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:127
 msgid "Remove selected books"
 msgstr "Cancella i libri selezionati"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:129
 msgid "Remove files of a specific format from selected books.."
 msgstr "Cancella i file di un formato specifico dai libri selezionati"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:132
 msgid "Remove all formats from selected books, except..."
 msgstr "Cancella tutti i formati dai libri selezionati, tranne..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:135
 msgid "Remove covers from selected books"
 msgstr "Cancella le copertine dai libri selezionati"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:138
 msgid "Remove matching books from device"
 msgstr "Rimuovi i libri corrispondenti dal dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:155
 msgid "Convert individually"
 msgstr "Converti individualmente"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:157
 msgid "Bulk convert"
 msgstr "Converti in gruppo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:161
 msgid "Create catalog of books in your calibre library"
-msgstr "Crea un catologo di libri dalla vostra collezione in Calibre"
+msgstr "Crea un catologo di libri dalla biblioteca di Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:169
 msgid "Run welcome wizard"
-msgstr "Fai partire l'assistente di configurazione iniziale"
+msgstr "Avvia l'assistente di configurazione iniziale"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:191
 msgid "Similar books..."
 msgstr "Libri simili..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:223
 msgid "Add books to library"
 msgstr "Aggiungi i libri alla biblioteca"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:234
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:241
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:239
 msgid "Manage collections"
 msgstr "Gestione collezioni"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:328
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:319
 msgid "Cover Browser"
 msgstr "Browser delle copertine"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:337
 msgid "Tag Browser"
 msgstr "Browser dei tag"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:358
+msgid "version"
+msgstr "versione"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:359
+msgid "created by Kovid Goyal"
+msgstr "creato da Kovid Goyal"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:377
+msgid "Connected "
+msgstr "Connesso "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:386
+msgid "Update found"
+msgstr "Aggiornamento trovato"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:430
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:439
 msgid "Book Details"
 msgstr "Dettagli del libro"
 
@@ -7771,6 +7871,236 @@ msgstr "Fare clic per vedere una lista dei lavori attivi"
 msgid " - Jobs"
 msgstr " - Lavori"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:64
+msgid ""
+"Library\n"
+"%d books"
+msgstr ""
+"Biblioteca\n"
+"%d libri"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:65
+msgid ""
+"Reader\n"
+"%s"
+msgstr ""
+"Lettore\n"
+"%s"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:66
+msgid ""
+"Card A\n"
+"%s"
+msgstr ""
+"Scheda A\n"
+"%s"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:67
+msgid ""
+"Card B\n"
+"%s"
+msgstr ""
+"Scheda B\n"
+"%s"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:71
+msgid "Click to see the books available on your computer"
+msgstr "Fare clic per visualizzare i libri presenti sul computer"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:74
+msgid "Click to see the books in the main memory of your reader"
+msgstr ""
+"Fare clic per visualizzare i libri presenti sulla memoria principale del "
+"dispositivo"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:75
+msgid "Click to see the books on storage card A in your reader"
+msgstr ""
+"Fare clic per visualizzare i libri presenti sulla scheda di memoria A del "
+"dispositivo"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:76
+msgid "Click to see the books on storage card B in your reader"
+msgstr ""
+"Fare clic per visualizzare i libri presenti sulla scheda di memoria A del "
+"dispositivo"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:84
+msgid "Books located at"
+msgstr "Libri presenti in"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:100
+msgid "free"
+msgstr "libero"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:134
+msgid ""
+"Books display will be restricted to those matching the selected saved search"
+msgstr ""
+"I libri visualizzati saranno limitati a quelli corrispondenti alla ricerca "
+"salvata selezionata"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:136
+msgid "Advanced search"
+msgstr "Ricerca avanzata"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:141
+msgid ""
+"<p>Search the list of books by title, author, publisher, tags, comments, "
+"etc.<br><br>Words separated by spaces are ANDed"
+msgstr ""
+"<p>Cerca nella lista dei libri per titolo, autore, editore, tag, commenti, "
+"etc.<br><br> Parole separate da spazi usano l'operatore AND"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:142
+msgid "Reset Quick Search"
+msgstr "Resetta ricerca veloce"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:328
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:144
+msgid "Copy current search text (instead of search name)"
+msgstr "Copia il testo della ricerca corrente (invece di cercare il nome)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:146
+msgid "Save current search under the name shown in the box"
+msgstr "Salva ricerca corrente sotto il nome indicato nella casella"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:148
+msgid "Delete current saved search"
+msgstr "Elimina ricerca salvata corrente"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:150
+msgid "Add books"
+msgstr "Aggiungi libri"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:151
+msgid "A"
+msgstr "A"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:153
+msgid "Remove books"
+msgstr "Cancella libri"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:154
+msgid "Del"
+msgstr "Canc"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:406
+msgid "Edit meta info"
+msgstr "Modifica metadati"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:406
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:156
+msgid "E"
+msgstr "E"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:157
+msgid "Merge book records"
+msgstr "Unisci i record dei libri"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:158
+msgid "M"
+msgstr "M"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:159
+msgid "Send to device"
+msgstr "Invia al dispositivo"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:161
+msgid "S"
+msgstr "S"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:162
+msgid "Fetch news"
+msgstr "Scarica notizie"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:163
+msgid "F"
+msgstr "F"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:164
+msgid "Convert books"
+msgstr "Converti libri"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:165
+msgid "C"
+msgstr "C"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:167
+msgid "V"
+msgstr "V"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:168
+msgid "Open containing folder"
+msgstr "Apri la cartella contenente"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:169
+msgid "Show book details"
+msgstr "Visualizza i dettagli del libro"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:170
+msgid "Books by same author"
+msgstr "Libri dello stesso autore"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:171
+msgid "Books in this series"
+msgstr "Libri in questa serie"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:172
+msgid "Books by this publisher"
+msgstr "Libri di questo editore"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:173
+msgid "Books with the same tags"
+msgstr "Libri con lo stesso tag"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:176
+msgid "Ctrl+P"
+msgstr "Ctrl+P"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:177
+msgid "Help"
+msgstr "Aiuto"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:178
+msgid "Browse the calibre User Manual"
+msgstr "Consulta il manuale utente di calibre"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:179
+msgid "F1"
+msgstr "F1"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:284
 msgid "N"
 msgstr "N"
@@ -7792,29 +8122,29 @@ msgid "Rating"
 msgstr "Valutazione"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:324
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1084
 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/models.py:674
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1176
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1182
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
 msgid "The lookup/search name is \"{0}\""
 msgstr "La parola chiave è \"{0}\""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:886
 msgid "In Library"
 msgstr "Nella biblioteca"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:885
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:890
 msgid "Size"
 msgstr "Dimensione"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1156
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1162
 msgid "Marked for deletion"
 msgstr "Marcato per l'eliminazione"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1165
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr "Doppio clic per <b>modificarmi</b><br><br>"
 
@@ -7858,11 +8188,11 @@ msgstr "Mostra colonna"
 msgid "Restore default layout"
 msgstr "Ripristina layout perdefinito"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:524
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:525
 msgid "Not allowed"
 msgstr "Non permesso"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:526
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
@@ -8068,159 +8398,34 @@ msgstr "Provate a far ripartire il computer."
 msgid "try deleting the file"
 msgstr "provate a rimuovere il documento"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:131
 msgid "calibre"
 msgstr "calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:133
 msgid "&Restrict to:"
 msgstr "&Limita a:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
-msgid ""
-"Books display will be restricted to those matching the selected saved search"
-msgstr ""
-"I libri visualizzati saranno limitati a quelli corrispondenti alla ricerca "
-"salvata selezionata"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:135
 msgid "set in ui.py"
 msgstr "posta in ui,py"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
-msgid "Advanced search"
-msgstr "Ricerca avanzata"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:138
 msgid "Alt+S"
 msgstr "Alt+S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:139
 msgid "&Search:"
 msgstr "&Cerca:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
-msgid ""
-"<p>Search the list of books by title, author, publisher, tags, comments, "
-"etc.<br><br>Words separated by spaces are ANDed"
-msgstr ""
-"<p>Cerca nella lista dei libri per titolo, autore, editore, tag, commenti, "
-"etc.<br><br> Parole separate da spazi usano l'operatore AND"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
-msgid "Reset Quick Search"
-msgstr "Resetta ricerca veloce"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
-msgid "Choose saved search or enter name for new saved search"
-msgstr "Scegliere ricerca salvata o inserire il nome per la nuova ricerca"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
-msgid "Copy current search text (instead of search name)"
-msgstr "Copia il testo della ricerca corrente (invece di cercare il nome)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
-msgid "Save current search under the name shown in the box"
-msgstr "Salva ricerca corrente sotto il nome indicato nella casella"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
-msgid "Delete current saved search"
-msgstr "Elimina ricerca salvata corrente"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
-msgid "Add books"
-msgstr "Aggiungi libri"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
-msgid "A"
-msgstr "A"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
-msgid "Remove books"
-msgstr "Cancella libri"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
-msgid "Del"
-msgstr "Canc"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:155
 msgid "Edit meta information"
 msgstr "Modifica metadati"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
-msgid "E"
-msgstr "E"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
-msgid "Merge book records"
-msgstr "Unisci i record dei libri"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
-msgid "M"
-msgstr "M"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
-msgid "Send to device"
-msgstr "Invia al dispositivo"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
-msgid "S"
-msgstr "S"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
-msgid "Fetch news"
-msgstr "Scarica notizie"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
-msgid "F"
-msgstr "F"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
-msgid "Convert E-books"
-msgstr "Converti libri"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
-msgid "C"
-msgstr "C"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
-msgid "V"
-msgstr "V"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
-msgid "Open containing folder"
-msgstr "Apri la cartella contenente"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
-msgid "Show book details"
-msgstr "Visualizza i dettagli del libro"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
-msgid "Books by same author"
-msgstr "Libri dello stesso autore"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
-msgid "Books in this series"
-msgstr "Libri in questa serie"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
-msgid "Books by this publisher"
-msgstr "Libri di questo editore"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
-msgid "Books with the same tags"
-msgstr "Libri con lo stesso tag"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:175
 msgid "Configure calibre"
 msgstr "Configurazione di Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
-msgid "Ctrl+P"
-msgstr "Ctrl+P"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:20
 msgid ""
 "Redirect console output to a dialog window (both stdout and stderr). Useful "
@@ -8249,33 +8454,42 @@ msgstr "Il Libro non ha ne titolo ne ISBN"
 msgid "No matches found for this book"
 msgstr "Nessun risultato é stato trovato per questo libro"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:91
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:553
 msgid "Search"
 msgstr "Cerca"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:313
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:315
 msgid "The selected search will be <b>permanently deleted</b>. Are you sure?"
 msgstr ""
 "La ricerca selezionata verrà <b>definitivamente eliminata</b>. Continuare?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:357
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr "Cerca (Per la ricerca avanzata fare clic sul pulsante di sinistra)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:392
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:398
 msgid "Saved Searches"
 msgstr "Ricerche Salvate"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:406
+msgid "Choose saved search or enter name for new saved search"
+msgstr "Scegliere ricerca salvata o inserire il nome per la nuova ricerca"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:10
+msgid "Restrict to"
+msgstr "Limita a"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:48
 msgid "({0} of {1})"
 msgstr "({0} di {1})"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
 msgid "(all books)"
 msgstr "(tutti i libri)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:56
 msgid "({0} of all)"
 msgstr "({0} di tutti)"
 
@@ -8398,18 +8612,33 @@ msgstr "Ordina per popolarità"
 msgid "Sort by average rating"
 msgstr "Ordina per valutazione media"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:775
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:772
+msgid "Set the sort order for entries in the Tag Browser"
+msgstr "Imposta l'ordinamento degli elementi nel browser dei tag"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:778
 msgid "Match all"
 msgstr "Fai corrispondere tutti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:775
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:778
 msgid "Match any"
 msgstr "Fai corrispondere uno qualsiasi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:783
+msgid ""
+"When selecting multiple entries in the Tag Browser match any or all of them"
+msgstr ""
+"Quando vengono selezionati più elementi nel browser dei tag fai "
+"corrisponderne qualsiasi o tutti"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:787
 msgid "Manage &user categories"
 msgstr "Gestione categorie &utente"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:790
+msgid "Add your own categories to the Tag Browser"
+msgstr "Aggiungi categorie personalizzate al browser dei tag"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182
 msgid "Convert book %d of %d (%s)"
@@ -8437,15 +8666,15 @@ msgstr "Creazione dell'ordine dei libri per conversione di gruppo"
 msgid "Queueing "
 msgstr "Creazione ordine "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:239
 msgid "Fetch news from "
 msgstr "Scarica notizie da "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:301
 msgid "Convert existing"
 msgstr "Converti i documenti presenti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:302
 msgid ""
 "The following books have already been converted to %s format. Do you wish to "
 "reconvert them?"
@@ -8459,57 +8688,47 @@ msgstr "&Ripristina"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/ui.py:164
 msgid "&Donate to support calibre"
-msgstr "&donate per supportare Calibre"
+msgstr "&Donazione per sostenere Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:168
 msgid "&Eject connected device"
 msgstr "&Espelli dispositivo connesso"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:173
 msgid "&Restart"
 msgstr "&Riavvia"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:206
-msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
-msgstr ""
-"<p>Per maggiori informazioni e aiuto vedere il: <a href=\"%s\">Manuale "
-"d'uso</a><br>"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:212
-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/ui.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:227
 msgid "Calibre Quick Start Guide"
 msgstr "Guida rapida di Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:389
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:380
 msgid "Cannot configure"
 msgstr "Impossibile configurare"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:376
 msgid "Cannot configure while there are running jobs."
 msgstr "Impossibile configurare mentre ci sono lavori in esecuzione"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:381
 msgid "Cannot configure before calibre is restarted."
 msgstr "Impossibile configurare prima che calibre sia riavviato."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:424
 msgid "No detailed info available"
 msgstr "Nessuna informazione dettagliata disponibile"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:425
 msgid "No detailed information is available for books on the device."
 msgstr "Non è disponibile alcun dettaglio per i libri nel dispositivo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:486
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr "Errore di conversione"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:487
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:478
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using third party tools."
@@ -8518,27 +8737,30 @@ msgstr ""
 "href=\"%s\">DRM</a>. É necessario rimuovere la DRM usando un prodotto da "
 "terzi."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:491
 msgid "Recipe Disabled"
 msgstr "Ricetta deattivata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:506
 msgid "<b>Failed</b>"
 msgstr "<b>Operazione Fallita</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:546
 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."
+"you find it useful, please consider donating to support its development. "
+"Your donation helps keep calibre development going."
 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."
+"è il risultato dell'impegno di molti volontari da tutto il mondo. Se lo "
+"trovi utile, considera la possibilità di fare una donazione per supportare "
+"lo sviluppo. La tua donazione aiuterà a mantenere attivo lo sviluppo di "
+"calibre."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:572
 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/ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:575
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
@@ -8549,11 +8771,11 @@ msgstr ""
 "sul dispositivo.<br>\n"
 "                      Interrompere l'operazione?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:579
 msgid "WARNING: Active jobs"
 msgstr "ATTENZIONE: Lavori attivi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:640
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:632
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -8561,19 +8783,11 @@ 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/update.py:52
-msgid ""
-"<span style=\"color:red; font-weight:bold\">Latest version: <a "
-"href=\"%s\">%s</a></span>"
-msgstr ""
-"<span style=\"color:red; font-weight:bold\">Ultima versione: <a "
-"href=\"%s\">%s</a></span>"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/update.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:56
 msgid "Update available"
 msgstr "Aggiornamento disponibile"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/update.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:57
 msgid ""
 "%s has been updated to version %s. See the <a href=\"http://calibre-"
 "ebook.com/whats-new\">new features</a>. Visit the download page?"
@@ -8716,8 +8930,8 @@ msgstr "&language predefinito per sillabazione:"
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:173
 msgid "&Resize images larger than the viewer window (needs restart)"
 msgstr ""
-"&Resize le immagini piu' grandi della finestra del visializzatore (richiede "
-"riavvio)"
+"&Ridimensiona le immagini più grandi della finestra del visualizzatore "
+"(richiede riavvio)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:174
 msgid "&User stylesheet"
@@ -8764,8 +8978,8 @@ msgstr "Larghezza maassima della finestra di visualizzazione in pixel."
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:48
 msgid "Resize images larger than the viewer window to fit inside it"
 msgstr ""
-"Modifica la grandezza delle immagini piu' grandi della finestra del "
-"visualizzatore per farle rientrare nella pagina"
+"&Ridimensiona le immagini più grandi della finestra del visualizzatore per "
+"farle entrare nella finestra"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:49
 msgid "Hyphenate text"
@@ -9061,109 +9275,43 @@ msgstr "Shift+F3"
 msgid "Print eBook"
 msgstr "Stampa del libro elettronico"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
 msgid "Copy Image"
 msgstr "Copia immagine"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:240
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:239
 msgid "Paste Image"
 msgstr "Incolla immagine"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:270
-msgid ""
-"Library\n"
-"%d\n"
-"books"
-msgstr ""
-"Biblioteca\n"
-"%d\n"
-"libri"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:271
-msgid ""
-"Reader\n"
-"%s\n"
-"available"
-msgstr ""
-"Lettore\n"
-"%s\n"
-"disponibile"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:272
-msgid ""
-"Card A\n"
-"%s\n"
-"available"
-msgstr ""
-"La scheda di memoria A \n"
-"%s\n"
-"disponibile"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:273
-msgid ""
-"Card B\n"
-"%s\n"
-"available"
-msgstr ""
-"La scheda di memoria B \n"
-"%s\n"
-"disponibile"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:277
-msgid "Click to see the books available on your computer"
-msgstr "Seleziona per vedere i libri disponibili sul vostro computer"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:280
-msgid "Click to see the books in the main memory of your reader"
-msgstr ""
-"Fare clic per vedere i libri disponibili sulla memoria principale del "
-"dispositivo"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:281
-msgid "Click to see the books on storage card A in your reader"
-msgstr ""
-"Fare clic per vedere i libri disponibili sulla scheda di memoria A del "
-"dispositivo"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:282
-msgid "Click to see the books on storage card B in your reader"
-msgstr ""
-"Fare clic per vedere i libri disponibili sulla scheda di memoria B del "
-"dispositivo"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:290
-msgid "Books located at"
-msgstr "Libri presenti in"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:364
 msgid "Change Case"
 msgstr "Modificare capitalizzazioned dei caratteri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:365
 msgid "Upper Case"
 msgstr "Maiuscole"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:366
 msgid "Lower Case"
 msgstr "Minuscole"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:367
 msgid "Swap Case"
 msgstr "Inverti capitalizzazione dei caratteri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:368
 msgid "Title Case"
 msgstr "Caratteri per titolo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:974
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:837
 msgid "Drag to resize"
 msgstr "Trasinare per ridimensionare"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:869
 msgid "Show"
 msgstr "Visualizza"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1012
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:876
 msgid "Hide"
 msgstr "Nascondi"
 
@@ -9792,7 +9940,9 @@ msgstr "Processa cartelle ricorsivamente"
 msgid ""
 "Add books to database even if they already exist. Comparison is done based "
 "on book titles."
-msgstr "Aggiunge libri al database anche se esistono già."
+msgstr ""
+"Aggiunge libri al database anche se esistono già. Il confronto è basato sui "
+"titoli."
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:282
 msgid "Add an empty book (a book with no formats)"
@@ -10534,13 +10684,11 @@ msgstr "Elenco delle ricerche salvate"
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:700
 msgid "User-created tag browser categories"
-msgstr ""
+msgstr "Categorie del browser di tag create dall'utente"
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:702
-msgid "Preserve all collections even if not in library metadata."
-msgstr ""
-"Conserva tutte le collezioni anche se non presenti nei metadati della "
-"biblioteca."
+msgid "How and when calibre updates metadata on the device."
+msgstr "Come e quando calibre aggiorna i metadati nel dispositivo."
 
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:43
 msgid "Waiting..."
@@ -10715,85 +10863,85 @@ msgstr "Sorgente di notizie sconosciuta"
 msgid "The \"%s\" recipe needs a username and password."
 msgstr "La ricetta \"%s\" richiede un nome utente e password."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:706
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:708
 msgid "Download finished"
 msgstr "Scaricamento completato"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:708
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:710
 msgid "Failed to download the following articles:"
 msgstr "Scaricamento dei seguenti articoli fallito:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:714
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:716
 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:716
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:718
 msgid " from "
 msgstr " da "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:718
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:720
 msgid "\tFailed links:"
 msgstr "\tLink falliti:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:807
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:809
 msgid "Could not fetch article. Run with -vv to see the reason"
 msgstr ""
 "Non é stato possibile ottnere l'articolo. Provare a eseguire con l'opzione -"
 "vv per maggiori informazioni sulla ragione."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:828
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:830
 msgid "Fetching feeds..."
 msgstr "Scaricamento feed..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:833
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:835
 msgid "Got feeds from index page"
 msgstr "Ricevuti feed dalla pagina principale"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:839
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:841
 msgid "Trying to download cover..."
 msgstr "Tentativo di scaricamento della copertina..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:841
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Generating masthead..."
 msgstr "Preparazione dell'immagine principale in corso"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:922
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:924
 msgid "Starting download [%d thread(s)]..."
 msgstr "Inizio scaricamento [%d articolo(i)]..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:938
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:940
 msgid "Feeds downloaded to %s"
 msgstr "Feed scaricati in %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:948
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:950
 msgid "Could not download cover: %s"
 msgstr "Impossibile scaricare la copertina: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:960
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
 msgid "Downloading cover from %s"
 msgstr "Scaricamento copertina da %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1002
 msgid "Masthead image downloaded"
 msgstr "Immagine principale scaricata"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1190
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1192
 msgid "Untitled Article"
 msgstr "Articolo senza titolo"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1261
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1263
 msgid "Article downloaded: %s"
 msgstr "Articolo scaricato: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1272
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1274
 msgid "Article download failed: %s"
 msgstr "Scaricamento fallito dell'articolo: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1289
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1291
 msgid "Fetching feed"
 msgstr "Scaricamento feed"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1436
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1438
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
@@ -10801,7 +10949,7 @@ msgstr ""
 "Impossibile accedere, controllare il nome utente e password per il servizio "
 "Periodici di calibre."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1452
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1454
 msgid ""
 "You do not have permission to download this issue. Either your subscription "
 "has expired or you have exceeded the maximum allowed downloads for today."
@@ -11510,6 +11658,13 @@ msgstr "Non scaricare i fogli di stile CSS"
 #~ msgid "Could not move database"
 #~ msgstr "Impossibile spostare il database"
 
+#~ msgid ""
+#~ "<span style=\"color:red; font-weight:bold\">Latest version: <a "
+#~ "href=\"%s\">%s</a></span>"
+#~ msgstr ""
+#~ "<span style=\"color:red; font-weight:bold\">Ultima versione: <a "
+#~ "href=\"%s\">%s</a></span>"
+
 #~ msgid ""
 #~ "Search the list of books by title or author<br><br>Words separated by spaces "
 #~ "are ANDed"
@@ -11524,6 +11679,9 @@ msgstr "Non scaricare i fogli di stile CSS"
 #~ "Cerca nella lista dei libri per titolo, autore, editore, tag e "
 #~ "commenti<br><br>Parole separate da spazi hanno come operatore AND"
 
+#~ msgid "Convert E-books"
+#~ msgstr "Converti libri"
+
 #~ msgid ""
 #~ "%%prog [options] ARG\n"
 #~ "\n"
@@ -11627,6 +11785,9 @@ msgstr "Non scaricare i fogli di stile CSS"
 #~ "<p>Per aiuto visitare <a "
 #~ "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
 
+#~ 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>"
+
 #~ msgid "Starting Bulk conversion of %d books"
 #~ msgstr "Avviamento conversione in gruppo di %d libri"
 
@@ -12315,6 +12476,13 @@ msgstr "Non scaricare i fogli di stile CSS"
 #~ msgid "Must set account information"
 #~ msgstr "È necessario inserire le informazioni dell'account"
 
+#~ 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 ""
+#~ "è il risultato degli sforzi di tanti volontari da tutto il mondo. Se lo "
+#~ "trovi utile, puoi fare una donazione per supportare il suo sviluppo."
+
 #~ msgid "You must set a username and password for %s"
 #~ msgstr "È necessario inserire nome utente e password per %s"
 
@@ -12356,6 +12524,24 @@ msgstr "Non scaricare i fogli di stile CSS"
 #~ "%s\n"
 #~ "disponibile"
 
+#~ msgid ""
+#~ "Reader\n"
+#~ "%s\n"
+#~ "available"
+#~ msgstr ""
+#~ "Lettore\n"
+#~ "%s\n"
+#~ "disponibile"
+
+#~ msgid ""
+#~ "Library\n"
+#~ "%d\n"
+#~ "books"
+#~ msgstr ""
+#~ "Biblioteca\n"
+#~ "%d\n"
+#~ "libri"
+
 #~ msgid "and delete from library"
 #~ msgstr "ed elimina dalla biblioteca"
 
@@ -12521,6 +12707,11 @@ msgstr "Non scaricare i fogli di stile CSS"
 #~ "Calibre puó mandare i vostri libri a voi (o i vostri lettori) con posta "
 #~ "elettronica."
 
+#~ msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
+#~ msgstr ""
+#~ "<p>Per maggiori informazioni e aiuto vedere il: <a href=\"%s\">Manuale "
+#~ "d'uso</a><br>"
+
 #~ msgid "Device database corrupted"
 #~ msgstr "Database del dispositivo di lettura corrotto"
 
@@ -12530,6 +12721,24 @@ msgstr "Non scaricare i fogli di stile CSS"
 #~ msgid "Could not access %s. Using %s as the library."
 #~ msgstr "Non é possibile accedere a %s. Si sta utilizzando %s come libreria."
 
+#~ msgid ""
+#~ "Card A\n"
+#~ "%s\n"
+#~ "available"
+#~ msgstr ""
+#~ "La scheda di memoria A \n"
+#~ "%s\n"
+#~ "disponibile"
+
+#~ msgid ""
+#~ "Card B\n"
+#~ "%s\n"
+#~ "available"
+#~ msgstr ""
+#~ "La scheda di memoria B \n"
+#~ "%s\n"
+#~ "disponibile"
+
 #~ msgid "The author sort string"
 #~ msgstr "Stringa per ordinare gli autori"
 
@@ -12646,3 +12855,27 @@ msgstr "Non scaricare i fogli di stile CSS"
 
 #~ msgid "Connect to iTunes (EXPERIMENTAL)"
 #~ msgstr "Connetti ad iTunes (SPERIMENTALE)"
+
+#~ msgid "Preserve device collections."
+#~ msgstr "Conserva le collezioni del dispositivo."
+
+#~ msgid ""
+#~ "If checked, collections will not be deleted even if a book with changed "
+#~ "metadata is resent and the collection is not in the book's metadata. In "
+#~ "addition, editing collections in the device view will be enabled. If "
+#~ "unchecked, collections will be always reflect only the metadata in the "
+#~ "calibre library."
+#~ msgstr ""
+#~ "Se attivo, le collezioni non verranno eliminate anche se un libro con i "
+#~ "metadati cambiati viene inviato e la collezione non è tra i metadati del "
+#~ "libro. In più, viene abilitata la modifica delle collezioni nel dispositivo. "
+#~ "Se disattivato, le collezioni rifletteranno sempre e solo i metadati nella "
+#~ "biblioteca di calibre."
+
+#~ msgid "  "
+#~ msgstr "  "
+
+#~ msgid "Preserve all collections even if not in library metadata."
+#~ msgstr ""
+#~ "Conserva tutte le collezioni anche se non presenti nei metadati della "
+#~ "biblioteca."
diff --git a/src/calibre/translations/lv.po b/src/calibre/translations/lv.po
index 90a80ab5b2..4a7622374a 100644
--- a/src/calibre/translations/lv.po
+++ b/src/calibre/translations/lv.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-07-03 01:21+0000\n"
-"PO-Revision-Date: 2010-07-02 18:19+0000\n"
+"POT-Creation-Date: 2010-07-09 22:00+0000\n"
+"PO-Revision-Date: 2010-07-09 20:21+0000\n"
 "Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Latvian <ivars_a@inbox.lv>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-03 03:45+0000\n"
+"X-Launchpad-Export-Date: 2010-07-10 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: LATVIA\n"
 "X-Poedit-Language: Latvian\n"
@@ -29,10 +29,10 @@ msgstr "Pilnīgi neko nedara"
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:71
 #: /home/kovid/work/calibre/src/calibre/devices/prs500/books.py:267
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:466
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:492
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:396
-#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:98
-#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:101
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:97
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:100
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/metadata.py:56
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:428
 #: /home/kovid/work/calibre/src/calibre/ebooks/fb2/input.py:67
@@ -74,9 +74,9 @@ msgstr "Pilnīgi neko nedara"
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:818
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:49
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:51
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:910
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:915
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:981
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:911
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:916
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:982
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:137
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:139
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:108
@@ -104,20 +104,20 @@ msgstr "Pilnīgi neko nedara"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:233
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:290
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:815
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:818
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:814
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:817
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:172
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:179
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:22
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:135
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:903
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:912
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1192
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1195
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:898
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:907
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1190
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1193
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:120
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:155
@@ -125,8 +125,8 @@ msgstr "Pilnīgi neko nedara"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:172
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:362
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:877
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1054
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:882
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1060
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:87
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:92
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:185
@@ -172,14 +172,14 @@ msgstr "Metadatu rakstītājs"
 msgid "Catalog generator"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:15
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:16
 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:51
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:52
 msgid ""
 "Character encoding for the input HTML files. Common choices include: cp1252, "
 "latin1, iso-8859-1 and utf-8."
@@ -187,56 +187,56 @@ msgstr ""
 "Rakstzīmju kodējums avota HTML failiem. Bieži vien tiek izmantots: cp1252, "
 "latin1, iso-8859-1 un utf-8."
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:58
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:59
 msgid ""
 "Create a PMLZ archive containing the PML file and all images in the "
 "directory pmlname_img or images. This plugin is run every time you add a PML "
 "file to the library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:90
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:93
 msgid "Extract cover from comic files"
 msgstr "Izvilkt vāku no komiksu failiem"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:117
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:128
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:140
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:150
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:160
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:171
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:181
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:191
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:201
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:211
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:221
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:232
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:243
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:255
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:276
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:287
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:297
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:307
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:120
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:131
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:153
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:163
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:174
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:184
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:194
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:204
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:214
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:224
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:235
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:246
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:258
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:279
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:290
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:300
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:310
 msgid "Read metadata from %s files"
 msgstr "Lasīt metadatus no %s failiem"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:266
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:269
 msgid "Read metadata from ebooks in RAR archives"
 msgstr "Lasīt metadatus no e-grāmatām RAR arhīvos"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:318
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:321
 msgid "Read metadata from ebooks in ZIP archives"
 msgstr "Lasīt metadatus no e-grāmatām ZIP arhīvos"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:331
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:341
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:351
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:373
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:384
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:394
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:334
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:344
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:354
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:376
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:387
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:397
 msgid "Set metadata in %s files"
 msgstr "Ierakstīti metadati %s failos"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:362
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:365
 msgid "Set metadata from %s files"
 msgstr ""
 
@@ -380,35 +380,35 @@ msgstr ""
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr "Šis profils ir paredzēts Amazon Kindle DX."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:31
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
 msgid "Installed plugins"
 msgstr "Uzstādītie spraudņi"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:33
 msgid "Mapping for filetype plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:33
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:34
 msgid "Local plugin customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:34
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
 msgid "Disabled plugins"
 msgstr "Atspējotie spraudņi"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
 msgid "Enabled plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:83
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:84
 msgid "No valid plugin found in "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:460
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:468
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:493
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
 msgid ""
 "    %prog options\n"
 "\n"
@@ -416,29 +416,29 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:499
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr "Pievienot spraudni, norādot zip failu, kurš to satur."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:503
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:511
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:505
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:513
 msgid "List all installed plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Enable the named plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Disable the named plugin"
 msgstr ""
 
@@ -589,7 +589,7 @@ msgstr ""
 msgid "Communicate with the BOOX eBook reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:121
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:123
 msgid ""
 "Comma separated list of directories to send e-books to on the device. The "
 "first one that exists will be used."
@@ -660,7 +660,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:51
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:54
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:57
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:157
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:159
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:64
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:67
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:70
@@ -670,22 +670,22 @@ msgstr ""
 msgid "Getting list of books on device..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:218
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:258
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:219
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:263
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:244
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:262
 msgid "Removing books from device..."
 msgstr "Dzēš grāmatas no ierīces..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:262
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:269
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:267
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:274
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:269
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:274
 msgid "Removing books from device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:274
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:308
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:313
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:208
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:238
 msgid "Adding books to device metadata listing..."
@@ -703,6 +703,10 @@ msgstr ""
 msgid "Communicate with the Sweex MM300"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/misc.py:75
+msgid "Communicate with the Pandigital Novel"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:17
 msgid "Communicate with the Nokia 770 internet tablet."
 msgstr ""
@@ -1458,6 +1462,51 @@ msgstr ""
 msgid "Creating"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/__init__.py:18
+msgid "ePub Fixer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/epubcheck.py:18
+msgid "Workaround epubcheck bugs"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/epubcheck.py:22
+msgid ""
+"Workarounds for bugs in the latest release of epubcheck. epubcheck reports "
+"many things as errors that are not actually errors. %prog will try to detect "
+"these and replace them with constructs that epubcheck likes. This may cause "
+"significant changes to your epub, complain to the epubcheck project."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:19
+msgid ""
+"%prog [options] file.epub\n"
+"\n"
+"Fix common problems in EPUB files that can cause them to be rejected by "
+"poorly designed publishing services.\n"
+"\n"
+"By default, no fixing is done and messages are printed out for each error "
+"detected. Use the options to control which errors are automatically fixed."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:50
+msgid "You must specify an epub file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:17
+msgid "Fix unmanifested files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:21
+msgid ""
+"Fix unmanifested files. %prog can either add them to the manifest or delete "
+"them as specified by the delete unmanifested option."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:32
+msgid "Delete unmanifested files instead of adding them to the manifest"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:56
 msgid ""
 "Extract the contents of the generated EPUB file to the specified directory. "
@@ -1766,11 +1815,11 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:98
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:882
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:887
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:543
 msgid "Title"
 msgstr "Nosaukums"
@@ -1779,7 +1828,7 @@ msgstr "Nosaukums"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:364
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:883
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:888
 msgid "Author(s)"
 msgstr "Autors(i)"
 
@@ -1802,7 +1851,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:67
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:318
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1073
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1079
 msgid "Comments"
 msgstr "Komentāri"
 
@@ -1811,7 +1860,7 @@ msgstr "Komentāri"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:306
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1069
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1075
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:139
 msgid "Tags"
 msgstr "Birkas"
@@ -1821,7 +1870,7 @@ msgstr "Birkas"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:323
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1084
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:87
 msgid "Series"
 msgstr "Sērija"
@@ -1831,7 +1880,7 @@ msgid "Language"
 msgstr "Valoda"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:406
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1067
 msgid "Timestamp"
 msgstr ""
 
@@ -2056,7 +2105,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1226
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1398
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1399
 msgid "Cover"
 msgstr "Vāks"
 
@@ -2095,70 +2144,70 @@ msgstr "Visi raksti"
 msgid "This is an Amazon Topaz book. It cannot be processed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1399
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1400
 msgid "Title Page"
 msgstr "Titullapa"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1400
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1401
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:15
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:53
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:194
 msgid "Table of Contents"
 msgstr "Satura rādītājs"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1401
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1402
 msgid "Index"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1402
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1403
 msgid "Glossary"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1403
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1404
 msgid "Acknowledgements"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1404
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1405
 msgid "Bibliography"
 msgstr "Bibliogrāfija"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1405
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1406
 msgid "Colophon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1406
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1407
 msgid "Copyright"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1407
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1408
 msgid "Dedication"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1408
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1409
 msgid "Epigraph"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1409
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1410
 msgid "Foreword"
 msgstr "Priekšvārds"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1410
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1411
 msgid "List of Illustrations"
 msgstr "Ilustrāciju saraksts"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1411
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1412
 msgid "List of Tables"
 msgstr "Tabulu saraksts"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1412
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1413
 msgid "Notes"
 msgstr "Piezīmes"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1413
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1414
 msgid "Preface"
 msgstr "Priekšvārds"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1414
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1415
 msgid "Main Text"
 msgstr "Pamatteksts"
 
@@ -2202,7 +2251,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:22
 #: /home/kovid/work/calibre/src/calibre/ebooks/tcr/input.py:23
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:23
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:24
 msgid ""
 "Normally calibre treats blank lines as paragraph markers. With this option "
 "it will assume that every line represents a paragraph instead."
@@ -2212,7 +2261,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:26
 #: /home/kovid/work/calibre/src/calibre/ebooks/tcr/input.py:27
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:27
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:28
 msgid ""
 "Normally calibre treats blank lines as paragraph markers. With this option "
 "it will assume that every line starting with an indent (either a tab or 2+ "
@@ -2341,7 +2390,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
 msgid "Author"
 msgstr "Autors"
@@ -2478,19 +2527,19 @@ msgid ""
 "slowest."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:33
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:34
 msgid ""
 "Normally extra spaces are condensed into a single space. With this option "
 "all spaces will be displayed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:36
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:37
 msgid ""
 "Run the text input through the markdown pre-processor. To learn more about "
 "markdown see"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:39
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:40
 msgid "Do not insert a Table of Contents into the output text."
 msgstr ""
 
@@ -2652,7 +2701,7 @@ msgstr "Kopēt"
 msgid "Copy to Clipboard"
 msgstr "Kopēt uz starpliktuvi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:400
 msgid "Choose Files"
 msgstr ""
 
@@ -2667,13 +2716,13 @@ msgid "User annotations generated from main library only"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:75
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:612
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:671
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:708
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:729
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:877
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1060
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:670
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:707
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:728
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:876
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:941
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1059
 msgid "No books selected"
 msgstr ""
 
@@ -2713,209 +2762,209 @@ msgstr ""
 msgid "How many empty books should be added?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:340
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:390
 msgid "Uploading books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:350
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:137
 msgid "Books"
 msgstr "Grāmatas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
 msgid "EPUB Books"
 msgstr "EPUB grāmatas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
 msgid "LRF Books"
 msgstr "LRF grāmatas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
 msgid "HTML Books"
 msgstr "HTML grāmatas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
 msgid "LIT Books"
 msgstr "LIT grāmatas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
 msgid "MOBI Books"
 msgstr "MOBI grāmatas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
 msgid "Topaz books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
 msgid "Text books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:359
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
 msgid "PDF Books"
 msgstr "PDF grāmatas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:359
 msgid "Comics"
 msgstr "Komiki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:360
 msgid "Archives"
 msgstr "Arhīvi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:364
 msgid "Supported books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:399
 msgid "Merged some books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:401
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:400
 msgid ""
 "Some duplicates were found and merged into the following existing books:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:409
 msgid "Failed to read metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:410
 msgid "Failed to read metadata from the following"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:434
 msgid "Add to library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:460
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1229
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:459
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1228
 msgid "No book selected"
 msgstr "Nav izvēlēta grāmata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:434
 msgid "No book files found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:456
 msgid "Cannot delete"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:469
 msgid "Choose formats to be deleted"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:488
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:487
 msgid "Choose formats <b>not</b> to be deleted"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:507
 msgid "Cannot delete books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:509
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:508
 msgid "No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:519
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:518
 msgid "Main memory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:519
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:444
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:453
 msgid "Storage Card A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:521
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:520
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:446
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:455
 msgid "Storage Card B"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:525
 msgid "No books to delete"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:526
 msgid "None of the selected books are on the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:544
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:600
 msgid "Deleting books from device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:564
 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/actions.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:585
 msgid ""
 "The selected books will be <b>permanently deleted</b> from your device. Are "
 "you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:610
 msgid "Cannot download metadata"
 msgstr "Nav iespējams lejupielādēt metadatus"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:627
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
 msgid "social metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
 msgid "covers"
 msgstr "vāki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
 msgid "metadata"
 msgstr "metadati"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:630
 msgid "Downloading %s for %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:654
 msgid "Failed to download some metadata"
 msgstr "Nav iespējams lejupielādēt daļu metadatu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:656
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
 msgid "Failed to download metadata for the following:"
 msgstr "Nevarēja lejuplādēt metadatus:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:659
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:658
 msgid "Failed to download metadata:"
 msgstr "Nevar lejuplādēt metadatus:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:660
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:659
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:637
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:522
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:949
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:951
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
 msgid "Error"
 msgstr "Kļūda"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:670
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:707
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:669
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:706
 msgid "Cannot edit metadata"
 msgstr "Nav iespējams rediģēt metadatus"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:728
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:731
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:727
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:730
 msgid "Cannot merge books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:732
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:731
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:736
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:735
 msgid ""
 "All book formats and metadata from the selected books will be added to the "
 "<b>first selected book.</b><br><br> The second and subsequently selected "
@@ -2923,7 +2972,7 @@ msgid ""
 "proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:747
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:746
 msgid ""
 "All book formats and metadata from the selected books will be merged into "
 "the <b>first selected book</b>.<br><br>After merger the second and "
@@ -2933,99 +2982,99 @@ msgid ""
 "from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:759
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:758
 msgid ""
 "You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
 "proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:876
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:875
 msgid "Cannot save to disk"
 msgstr "Nav iespējams saglabāt diskā"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:878
 msgid "Choose destination directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:912
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:911
 msgid "Error while saving"
 msgstr "Kļūda saglabājot"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:913
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:912
 msgid "There was an error while saving."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:919
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:920
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:921
 msgid "Could not save some books"
 msgstr "Dažas grāmatas nevarēja saglabāt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:922
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:921
 msgid "Click the show details button to see which ones."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
 msgid "No books selected to generate catalog for"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:960
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:959
 msgid "Generating %s catalog..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:965
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:964
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:264
 msgid "No books found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:966
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:965
 msgid ""
 "No books to catalog\n"
 "Check exclude tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:976
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:975
 msgid "Catalog generated."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:979
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:978
 msgid "Export Catalog Directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:980
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:979
 msgid "Select destination for %s.%s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:996
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:995
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1009
 msgid " fetched."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1059
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1058
 msgid "Cannot convert"
 msgstr "Nav iespējams pārveidot"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1088
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1087
 msgid "Starting conversion of %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1265
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1264
 msgid "Cannot view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1209
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
 msgid "Choose the format to view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1218
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1217
 msgid "Multiple Books Selected"
 msgstr "Izvēlētas vairākas grāmatas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1219
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1218
 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 "
@@ -3033,11 +3082,11 @@ msgid ""
 "continue?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1227
 msgid "Cannot open folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1266
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1265
 msgid "%s has no available formats."
 msgstr ""
 
@@ -3062,7 +3111,7 @@ msgid "The specified directory could not be processed."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:845
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:840
 msgid "No books"
 msgstr ""
 
@@ -3186,15 +3235,15 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:52
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:633
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:637
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:366
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:371
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:385
@@ -3218,12 +3267,12 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:265
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:186
@@ -3253,8 +3302,9 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:313
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1059
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1065
 msgid "Path"
 msgstr "Atrodas"
 
@@ -3271,8 +3321,8 @@ msgid "Formats"
 msgstr "Formāti"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:25
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:886
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1062
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:891
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1068
 msgid "Collections"
 msgstr ""
 
@@ -3285,12 +3335,12 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:305
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:311
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:317
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1068
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1072
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1074
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:458
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:467
 msgid "None"
 msgstr "Nav"
 
@@ -4352,11 +4402,11 @@ msgid ""
 "href=\"http://calibre-ebook.com/user_manual/xpath.html\">XPath Tutorial</a>."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:127
 msgid "Cover browser could not be loaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:179
 msgid "Browse by covers"
 msgstr "Pārlūkot vākus"
 
@@ -4546,128 +4596,124 @@ msgstr "Ierīce: "
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:778
-msgid "Connected "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:846
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:851
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:846
 msgid "Choose format to send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:860
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:855
 msgid "No device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:856
 msgid "Cannot send: No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:868
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:859
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:863
 msgid "No card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:869
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:860
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:910
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:905
 msgid "E-book:"
 msgstr "E-grāmata:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:913
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:908
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:909
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:181
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:915
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:910
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:928
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:923
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:958
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:965
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1057
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1118
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1236
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:953
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:961
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1053
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1115
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1234
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1242
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:959
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:954
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:966
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:962
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:984
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:980
 msgid "Failed to email books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:985
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:981
 msgid "Failed to email the following books:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:989
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:985
 msgid "Sent by email:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1016
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1012
 msgid "News:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1017
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1013
 msgid "Attached is the"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1028
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1024
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1058
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1237
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1054
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1235
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1087
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1084
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1150
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1148
 msgid "Sending news to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1201
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1244
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1243
 msgid ""
 "Could not upload the following books to the device, as no suitable formats "
 "were found. Convert the book(s) to a format supported by your device first."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1305
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1304
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1306
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1305
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -4705,7 +4751,7 @@ msgid "My Books"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:69
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:289
 msgid "Generate catalog"
 msgstr ""
 
@@ -4842,157 +4888,157 @@ msgstr ""
 msgid "Narrow"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:503
 msgid "System port selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:503
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:504
 msgid ""
 "The value <b>%d</b> you have chosen for the content server port is a system "
 "port. Your operating system <b>may</b> not allow the server to run on this "
 "port. To be safe choose a port number larger than 1024."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:524
 msgid "Failed to install command line tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:527
 msgid "Command line tools installed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:528
 msgid "Command line tools installed in"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:529
 msgid ""
 "If you move calibre.app, you have to re-install the command line tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:580
 msgid "No valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:581
 msgid "%s is not a valid plugin path"
 msgstr "%s nav derīga spraudņu atrašanās vieta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:584
 msgid "Choose plugin"
 msgstr "Izvēlieties spraudni"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:596
 msgid "Plugin cannot be disabled"
 msgstr "Spraudni nevar atspējot"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:597
 msgid "The plugin: %s cannot be disabled"
 msgstr "Spraudni %s nevar atspējot"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:606
 msgid "Plugin not customizable"
 msgstr "Spraudnis nav pielāgojams"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:607
 msgid "Plugin: %s does not need customization"
 msgstr "Spraudnim %s nav nepieciešama pielāgošana"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:615
 msgid "Customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:652
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:653
 msgid "Cannot remove builtin plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:653
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:654
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:684
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:685
 msgid "You must select a column to delete it"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:690
 msgid "The selected column is not a custom column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:690
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:691
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
 msgid "Are you sure?"
 msgstr "Vai esat pārliecināts?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:691
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:692
 msgid "Do you really want to delete column %s and all its data?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:758
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:759
 msgid "Error log:"
 msgstr "Kļūdu žurnāls:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:765
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:766
 msgid "Access log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:793
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:794
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:332
 msgid "Failed to start content server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:817
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:818
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:587
 msgid "Select location for books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:824
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:825
 msgid "Invalid size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:825
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:826
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:884
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:889
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:891
 msgid "Invalid database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:885
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:887
 msgid "Invalid database location "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:888
 msgid "<br>Must be a directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:890
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:892
 msgid "Invalid database location.<br>Cannot write to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:895
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:897
 msgid "Must restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:896
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:898
 msgid ""
 "The changes you made require that Calibre be restarted. Please restart as "
 "soon as practical."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:930
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:932
 msgid "Checking database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:950
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:952
 msgid "Failed to check database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:957
 msgid "Some inconsistencies found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:956
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:958
 msgid ""
 "The following books had formats listed in the database that are not actually "
 "available. The entries for the formats have been removed. You should check "
@@ -5120,14 +5166,14 @@ msgstr ""
 msgid "Sending to &device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:167
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr "Iestatījumi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
@@ -5135,283 +5181,287 @@ msgstr ""
 "Grāmatu &glabāšanas vieta (E-grāmatas tiek glabātas autoriem atbilstošos "
 "katalogos. Metadati tiek glabāti failā metadata.db)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
 msgid "Browse for the new database location"
 msgstr "Izvēlēties jaunu datubāzes atrašanās vietu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
 msgid "Show notification when &new version is available"
 msgstr "Informēt, kad pieejama &jauna versija"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
 msgid "Download &social metadata (tags/ratings/etc.) by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
 msgid "&Overwrite author and title by default when fetching metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
 msgid "Default network &timeout:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
 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/config_ui.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
 msgid " seconds"
 msgstr " sekundes"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
 msgid "Choose &language (requires restart):"
 msgstr "Izvēlieties va&lodu (nepieciešams pārstartēt):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
 msgid "Normal"
 msgstr "Standarta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
 msgid "High"
 msgstr "Augsta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
 msgid "Low"
 msgstr "Zema"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
 msgid "Job &priority:"
 msgstr "Darbu &prioritāte:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
 msgid "Preferred &output format:"
 msgstr "Vēlamais &rezultāta formāts:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
 msgid "Preferred &input format order:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
 msgid "Use &Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
 msgid "Show &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
 msgid "Show &average ratings in the tags browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
 msgid "Search as you type"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
 msgid "&Delete news from library when it is automatically sent to reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
 msgid "Toolbar"
 msgstr "Rīkjosla"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
 msgid "Large"
 msgstr "Liela"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
 msgid "Medium"
 msgstr "Vidēja"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
 msgid "Small"
 msgstr "Maza"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
 msgid "&Button size in toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
 msgid "Show &text in toolbar buttons"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
 msgid "Select visible &columns in library view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
 msgid "Remove a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
 msgid "Add a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
 msgid "Edit settings of a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
 msgid "Use internal &viewer for:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
 msgid "User Interface &layout (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
 msgid "Disable &animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
-msgid "Add an email address to which to send books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
-msgid "&Add email"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
-msgid "Make &default"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
-msgid "&Remove email"
+msgid "Show &donate button (restart)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
+msgid "Add an email address to which to send books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
+msgid "&Add email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
+msgid "Make &default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
+msgid "&Remove email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
 msgid ""
 "calibre can send your books to you (or your reader) by email. Emails will be "
 "automatically sent for downloaded news to all email addresses that have Auto-"
 "send checked."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
 msgid "&Maximum number of waiting worker processes (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
 msgid "&Check database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
 msgid "&Install command line tools"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
 msgid "Open calibre &configuration directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
 msgid "Limit the max. simultaneous jobs to the available CPU &cores"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
 msgid "Debug &device detection"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
 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/config_ui.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
 msgid "Server &port:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:212
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:117
 msgid "&Username:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:213
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:119
 msgid "&Password:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
 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/config_ui.py:615
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
 msgid "Max. &cover size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:621
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:214
 msgid "&Show password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
 msgid "Max. &OPDS items per query:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
 msgid "Max. OPDS &ungrouped items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
 msgid "&Start Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:621
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
 msgid "St&op Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:626
 msgid "&Test Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
 msgid "Run server &automatically on startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:628
 msgid "View &server logs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:46
 msgid ""
 "<p>Remember to leave calibre running as the server only runs as long as "
@@ -5422,33 +5472,33 @@ msgid ""
 "the IP address of the computer calibre is running on."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:631
 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/config_ui.py:628
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:632
 msgid "Enable/&Disable plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:633
 msgid "&Customize plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:630
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:634
 msgid "&Remove plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:635
 msgid "Add new plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:632
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:636
 msgid "Plugin &file:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:634
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:638
 msgid "&Add"
 msgstr ""
 
@@ -5486,9 +5536,9 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:31
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:884
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:889
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Date"
 msgstr "Datums"
@@ -5680,12 +5730,18 @@ msgstr ""
 msgid "ERROR"
 msgstr "KĻŪDA"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:67
+msgid ""
+"All checked books will be <b>permanently deleted</b> from your device. "
+"Please verify the list."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 msgid "Location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1058
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1064
 msgid "Format"
 msgstr ""
 
@@ -6492,6 +6548,10 @@ msgstr ""
 msgid "Add tag to available tags and apply it to current book"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:20
+msgid "%s (was %s)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:501
 msgid "Item is blank"
@@ -6826,43 +6886,43 @@ msgstr ""
 msgid "Save single format to disk..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:53
 msgid "Edit metadata individually"
 msgstr "Rediģēt metadatus grāmatai"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:56
 msgid "Edit metadata in bulk"
 msgstr "Rediģēt metadatus masveidā"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:59
 msgid "Download metadata and covers"
 msgstr "Lejupielādēt metadatus un vākus"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:62
 msgid "Download only metadata"
 msgstr "Lejupielādēt tikai metadatus"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:64
 msgid "Download only covers"
 msgstr "Lejupielādēt tikai vākus"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:67
 msgid "Download only social metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:73
 msgid "Merge into first selected book - delete others"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:76
 msgid "Merge into first selected book - keep others"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:84
 msgid "Add books from a single directory"
 msgstr "Pievienot vienā katalogā esošas grāmatas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:86
 msgid ""
 "Add books from directories, including sub-directories (One book per "
 "directory, assumes every ebook file is the same book in a different format)"
@@ -6871,7 +6931,7 @@ msgstr ""
 "(Katalogā viena grāmata, katrs e-grāmatu fails tiek uzskatītas par vienu un "
 "to pašu grāmatu dažādos formātos)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:90
 msgid ""
 "Add books from directories, including sub directories (Multiple books per "
 "directory, assumes every ebook file is a different book)"
@@ -6880,98 +6940,114 @@ msgstr ""
 "(Vairākas grāmatas katalogā, atsevišķi e-grāmatu faili tiek uzskatīti par "
 "dažādām grāmatām)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:93
 msgid "Add Empty book. (Book entry with no formats)"
 msgstr "Pievienot tukšu grāmatu. (Grāmatas ierakstu bez formātiem)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:102
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
 msgid "Save to disk"
 msgstr "Saglabāt diskā"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Save to disk in a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:106
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:402
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:394
 msgid "Save only %s format to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:110
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:397
 msgid "Save only %s format to disk in a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:119
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
 msgid "View"
 msgstr "Skatīt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:121
 msgid "View specific format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:127
 msgid "Remove selected books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:129
 msgid "Remove files of a specific format from selected books.."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:132
 msgid "Remove all formats from selected books, except..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:135
 msgid "Remove covers from selected books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:138
 msgid "Remove matching books from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:155
 msgid "Convert individually"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:157
 msgid "Bulk convert"
 msgstr "Masveida pārveidošana"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:161
 msgid "Create catalog of books in your calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:169
 msgid "Run welcome wizard"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:205
 msgid "Similar books..."
 msgstr "Līdzīgas grāmatas..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:237
 msgid "Add books to library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:234
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:241
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:253
 msgid "Manage collections"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:328
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:333
 msgid "Cover Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:351
 msgid "Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:372
+msgid "version"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:373
+msgid "created by Kovid Goyal"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:391
+msgid "Connected "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:400
+msgid "Update found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:454
 msgid "Book Details"
 msgstr ""
 
@@ -7055,29 +7131,29 @@ msgid "Rating"
 msgstr "Vērtējums"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:324
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1084
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr "<font face=\"serif\">%s</font>. no %s grāmatām."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:674
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1176
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1182
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:886
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:885
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:890
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1156
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1162
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1165
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr ""
 
@@ -7121,11 +7197,11 @@ msgstr ""
 msgid "Restore default layout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:524
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:525
 msgid "Not allowed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:526
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
@@ -7322,155 +7398,163 @@ msgstr ""
 msgid "try deleting the file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:247
 msgid "calibre"
 msgstr "calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:249
 msgid "&Restrict to:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:250
 msgid ""
 "Books display will be restricted to those matching the selected saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:251
 msgid "set in ui.py"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:252
 msgid "Advanced search"
 msgstr "Paplašinātā meklēšana"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
 msgid "Alt+S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
 msgid "&Search:"
 msgstr "&Meklēt:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
 msgid ""
 "<p>Search the list of books by title, author, publisher, tags, comments, "
 "etc.<br><br>Words separated by spaces are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
 msgid "Reset Quick Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
-msgid "Choose saved search or enter name for new saved search"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
 msgid "Copy current search text (instead of search name)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
 msgid "Save current search under the name shown in the box"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
 msgid "Delete current saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
 msgid "Add books"
 msgstr "Pievienot grāmatas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
 msgid "A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
 msgid "Remove books"
 msgstr "Dzēst grāmatas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
 msgid "Del"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
 msgid "Edit meta information"
 msgstr "Rediģēt metadatus"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
 msgid "E"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
 msgid "Merge book records"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
 msgid "M"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
 msgid "Send to device"
 msgstr "Sūtīt uz ierīci"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
 msgid "S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
 msgid "Convert E-books"
 msgstr "Pārveidot e-grāmatas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
 msgid "C"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
 msgid "V"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
 msgid "Open containing folder"
 msgstr "Atvērt katalogu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
 msgid "Show book details"
 msgstr "Parādīt grāmatas detaļas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
 msgid "Books by same author"
 msgstr "Šī paša autora grāmatas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
 msgid "Books in this series"
 msgstr "Šīs sērijas grāmatas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
 msgid "Books by this publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
 msgid "Books with the same tags"
 msgstr "Grāmatas ar tādām pašām birkām"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
 msgid "Configure calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
 msgid "Ctrl+P"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
+msgid "Help"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
+msgid "Browse the calibre User Manual"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
+msgid "F1"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:20
 msgid ""
 "Redirect console output to a dialog window (both stdout and stderr). Useful "
@@ -7497,32 +7581,36 @@ msgstr "Grāmatai nav ne nosaukuma ne ISBN"
 msgid "No matches found for this book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:91
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:262
 msgid "Search"
 msgstr "Meklēt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:313
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:315
 msgid "The selected search will be <b>permanently deleted</b>. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:357
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr "Meklēt (paplašinātai meklēšanai nospiediet pogu kreisajā pusē)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:392
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:398
 msgid "Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:406
+msgid "Choose saved search or enter name for new saved search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:47
 msgid "({0} of {1})"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:53
 msgid "(all books)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:55
 msgid "({0} of all)"
 msgstr ""
 
@@ -7645,18 +7733,31 @@ msgstr ""
 msgid "Sort by average rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:775
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:772
+msgid "Set the sort order for entries in the Tag Browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:778
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:775
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:778
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:783
+msgid ""
+"When selecting multiple entries in the Tag Browser match any or all of them"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:787
 msgid "Manage &user categories"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:790
+msgid "Add your own categories to the Tag Browser"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182
 msgid "Convert book %d of %d (%s)"
@@ -7682,15 +7783,15 @@ msgstr ""
 msgid "Queueing "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:239
 msgid "Fetch news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:301
 msgid "Convert existing"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:302
 msgid ""
 "The following books have already been converted to %s format. Do you wish to "
 "reconvert them?"
@@ -7704,104 +7805,91 @@ msgstr ""
 msgid "&Donate to support calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:168
 msgid "&Eject connected device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:173
 msgid "&Restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:206
-msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:212
-msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:227
 msgid "Calibre Quick Start Guide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:389
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:381
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:377
 msgid "Cannot configure while there are running jobs."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:382
 msgid "Cannot configure before calibre is restarted."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:425
 msgid "No detailed info available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:426
 msgid "No detailed information is available for books on the device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:486
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:478
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:506
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:487
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:479
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using third party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:492
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:507
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:547
 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."
+"you find it useful, please consider donating to support its development. "
+"Your donation helps keep calibre development going."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:573
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:576
 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/ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:640
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:633
 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/update.py:52
-msgid ""
-"<span style=\"color:red; font-weight:bold\">Latest version: <a "
-"href=\"%s\">%s</a></span>"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/update.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:56
 msgid "Update available"
 msgstr "Pieejams atjauninājums"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/update.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:57
 msgid ""
 "%s has been updated to version %s. See the <a href=\"http://calibre-"
 "ebook.com/whats-new\">new features</a>. Visit the download page?"
@@ -8279,32 +8367,25 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:270
 msgid ""
 "Library\n"
-"%d\n"
-"books"
+"%d books"
 msgstr ""
-"Biblitotēkā\n"
-"%d\n"
-"grāmatas"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:271
 msgid ""
 "Reader\n"
-"%s\n"
-"available"
+"%s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:272
 msgid ""
 "Card A\n"
-"%s\n"
-"available"
+"%s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:273
 msgid ""
 "Card B\n"
-"%s\n"
-"available"
+"%s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:277
@@ -8327,35 +8408,39 @@ msgstr ""
 msgid "Books located at"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:306
+msgid "free"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:557
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:558
 msgid "Upper Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:559
 msgid "Lower Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:560
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:561
 msgid "Title Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:974
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:983
 msgid "Drag to resize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1015
 msgid "Show"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1012
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1022
 msgid "Hide"
 msgstr ""
 
@@ -9624,89 +9709,89 @@ msgstr ""
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:706
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:708
 msgid "Download finished"
 msgstr "Lejupielāde pabeigta"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:708
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:710
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:714
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:716
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:716
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:718
 msgid " from "
 msgstr " no "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:718
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:720
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:807
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:809
 msgid "Could not fetch article. Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:828
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:830
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:833
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:835
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:839
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:841
 msgid "Trying to download cover..."
 msgstr "Mēģina lejupielādēt vāku..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:841
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:922
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:924
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:938
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:940
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:948
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:950
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:960
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
 msgid "Downloading cover from %s"
 msgstr "Lejupielādē vāku no %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1002
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1190
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1192
 msgid "Untitled Article"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1261
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1263
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1272
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1274
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1289
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1291
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1436
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1438
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1452
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1454
 msgid ""
 "You do not have permission to download this issue. Either your subscription "
 "has expired or you have exceeded the maximum allowed downloads for today."
@@ -9797,6 +9882,15 @@ msgstr ""
 #~ msgid "Sort by &popularity"
 #~ msgstr "Kārtot pēc &popularitātes"
 
+#~ msgid ""
+#~ "Library\n"
+#~ "%d\n"
+#~ "books"
+#~ msgstr ""
+#~ "Biblitotēkā\n"
+#~ "%d\n"
+#~ "grāmatas"
+
 #~ msgid "This profile is intended for the SONY PRS line. The 500/505/700 etc."
 #~ msgstr "Šis profils ir paredzēts SONY PRS sērijai. 500/505/700 u.c."
 
diff --git a/src/calibre/translations/nb.po b/src/calibre/translations/nb.po
index adb956f9dd..c5a05514dd 100644
--- a/src/calibre/translations/nb.po
+++ b/src/calibre/translations/nb.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-07-03 01:21+0000\n"
-"PO-Revision-Date: 2010-07-06 09:39+0000\n"
+"POT-Creation-Date: 2010-07-10 16:12+0000\n"
+"PO-Revision-Date: 2010-07-15 10:49+0000\n"
 "Last-Translator: Øyvind Øritsland <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: 2010-07-07 03:38+0000\n"
+"X-Launchpad-Export-Date: 2010-07-16 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
@@ -27,10 +27,10 @@ msgstr "Gjør absolutt ingenting"
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:71
 #: /home/kovid/work/calibre/src/calibre/devices/prs500/books.py:267
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:466
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:396
-#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:98
-#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:101
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:492
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:398
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:97
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:100
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/metadata.py:56
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:428
 #: /home/kovid/work/calibre/src/calibre/ebooks/fb2/input.py:67
@@ -72,9 +72,9 @@ msgstr "Gjør absolutt ingenting"
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:818
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:49
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:51
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:910
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:915
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:981
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:911
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:916
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:982
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:137
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:139
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:108
@@ -102,20 +102,20 @@ msgstr "Gjør absolutt ingenting"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:233
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:290
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:815
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:818
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:814
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:817
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:172
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:179
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:22
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:135
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:903
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:912
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1192
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1195
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:899
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:908
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1191
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1194
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:120
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:155
@@ -123,8 +123,8 @@ msgstr "Gjør absolutt ingenting"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:172
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:362
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:877
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1054
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:882
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1060
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:87
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:92
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:185
@@ -170,7 +170,7 @@ msgstr "Metadata-skriver"
 msgid "Catalog generator"
 msgstr "Katalogoppretter"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:15
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:16
 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 "
@@ -180,7 +180,7 @@ msgstr ""
 "lenkede filer. Dette programtillegget kjører hver gang du legger til en HTML "
 "fil til biblioteket."
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:51
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:52
 msgid ""
 "Character encoding for the input HTML files. Common choices include: cp1252, "
 "latin1, iso-8859-1 and utf-8."
@@ -188,7 +188,7 @@ msgstr ""
 "Skrifttegnkoding for inndata av HTML filer. Vanlige valg inkluderer: cp1252, "
 "latin1, iso-8859-1 og utf-8."
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:58
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:59
 msgid ""
 "Create a PMLZ archive containing the PML file and all images in the "
 "directory pmlname_img or images. This plugin is run every time you add a PML "
@@ -198,49 +198,49 @@ msgstr ""
 "pmlname_img eller images. Dette programtillegget kjører hver gang du legger "
 "til en PML-fil til biblioteket."
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:90
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:93
 msgid "Extract cover from comic files"
 msgstr "Ekstrakter omslagside fra tegneseriefiler"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:117
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:128
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:140
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:150
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:160
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:171
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:181
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:191
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:201
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:211
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:221
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:232
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:243
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:255
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:276
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:287
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:297
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:307
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:120
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:131
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:153
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:163
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:174
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:184
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:194
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:204
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:214
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:224
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:235
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:246
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:258
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:279
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:290
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:300
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:310
 msgid "Read metadata from %s files"
 msgstr "Les metadata fra %s filer"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:266
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:269
 msgid "Read metadata from ebooks in RAR archives"
 msgstr "Les metadata fra e boken i RAR arkivene"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:318
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:321
 msgid "Read metadata from ebooks in ZIP archives"
 msgstr "Les metadata fra e boken i ZIP arkivene"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:331
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:341
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:351
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:373
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:384
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:394
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:334
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:344
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:354
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:376
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:387
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:397
 msgid "Set metadata in %s files"
 msgstr "Set metadata i %s filer"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:362
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:365
 msgid "Set metadata from %s files"
 msgstr "Set metadata fra %s filer"
 
@@ -399,35 +399,35 @@ msgstr ""
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr "Denne profilen er ment for Amazon Kindle DX."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:31
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
 msgid "Installed plugins"
 msgstr "Installerte programtillegg"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:33
 msgid "Mapping for filetype plugins"
 msgstr "Kartlegging av programtillegg for filtyper"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:33
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:34
 msgid "Local plugin customization"
 msgstr "Lokal innstilling av programtillegg"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:34
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
 msgid "Disabled plugins"
 msgstr "Slå av programtillegg"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
 msgid "Enabled plugins"
 msgstr "Påslåtte programtillegg"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:83
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:84
 msgid "No valid plugin found in "
 msgstr "Ingen gyldige programtillegg ble funnet i "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:460
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:468
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr "Initialisering av programtillegg %s mislykket med sporingshistorie:"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:493
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
 msgid ""
 "    %prog options\n"
 "\n"
@@ -439,19 +439,19 @@ msgstr ""
 "    Tilpass Calibre ved å laste eksterne programtillegg.\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:499
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr ""
 "Legg til et programtillegg ved å spesifisere stien hvor den befinner seg i "
 "ZIP filen"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 "Fjern et tilpasset programtillegg ved navn. Dette har ingen effekt på "
 "innebygde programtillegg"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:503
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:511
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
@@ -459,15 +459,15 @@ msgstr ""
 "Tilpass programtillegg. Spesifiser navnet på programtillegget og "
 "tilpassningsstrengen separert ved komma."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:505
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:513
 msgid "List all installed plugins"
 msgstr "Se alle Installerte programtillegg"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Enable the named plugin"
 msgstr "Slå på navngitte programtillegg"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Disable the named plugin"
 msgstr "Slå av navngitte programtillegg"
 
@@ -625,7 +625,7 @@ msgstr "Kommuniser med Hanlin V5 eBook lesere"
 msgid "Communicate with the BOOX eBook reader."
 msgstr "Kommuniser med BOOZ eBook leser"
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:121
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:123
 msgid ""
 "Comma separated list of directories to send e-books to on the device. The "
 "first one that exists will be used."
@@ -698,34 +698,34 @@ msgstr "Kommuniser med Kobo Reader"
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:51
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:54
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:57
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:157
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:159
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:64
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:67
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:70
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:130
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:137
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:160
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:139
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:162
 msgid "Getting list of books on device..."
 msgstr "Motta liste over bøker på enheten..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:218
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:258
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:244
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:262
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:219
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:263
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:246
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:264
 msgid "Removing books from device..."
 msgstr "Fjern bøker fra enheten..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:262
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:269
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:269
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:274
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:267
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:274
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:271
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:276
 msgid "Removing books from device metadata listing..."
 msgstr "Fjern bøker fra enhetens metadatalister..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:274
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:308
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:208
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:238
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:313
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:210
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:240
 msgid "Adding books to device metadata listing..."
 msgstr "Legg bøker til enhetens metadatalister..."
 
@@ -741,6 +741,10 @@ msgstr "Kommuniser med Booq Avant"
 msgid "Communicate with the Sweex MM300"
 msgstr "Kommuniser med Sweex MM300"
 
+#: /home/kovid/work/calibre/src/calibre/devices/misc.py:75
+msgid "Communicate with the Pandigital Novel"
+msgstr "Kommuniser med Pandigital Novel"
+
 #: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:17
 msgid "Communicate with the Nokia 770 internet tablet."
 msgstr "Kommuniser med Nokia 770 internet enhet."
@@ -890,12 +894,12 @@ msgstr "Kommuniser med en eBokleser"
 msgid "Get device information..."
 msgstr "Få informasjon om enheten..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:188
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:192
 msgid "Transferring books to device..."
 msgstr "Overfører bøker til enheten..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:305
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:307
 msgid "Sending metadata to device..."
 msgstr "Overfører metadata til enheten..."
 
@@ -1659,6 +1663,68 @@ msgstr "Kjører transformering av e-boken..."
 msgid "Creating"
 msgstr "Oppretter"
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/__init__.py:18
+msgid "ePub Fixer"
+msgstr "ePub Fixer"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/epubcheck.py:18
+msgid "Workaround epubcheck bugs"
+msgstr "Fiks for epubcheck bugs"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/epubcheck.py:22
+msgid ""
+"Workarounds for bugs in the latest release of epubcheck. epubcheck reports "
+"many things as errors that are not actually errors. epub-fix will try to "
+"detect these and replace them with constructs that epubcheck likes. This may "
+"cause significant changes to your epub, complain to the epubcheck project."
+msgstr ""
+"Fiks for bug i den siste versjonen av epubcheck. Epubcheck rapporterer flere "
+"feil som ikke er faktiske feil. epub-fix vil forsøke å oppdate og erstatte "
+"disse med konstruksjoner som epubcheck liker. Dette kan føre til strørre "
+"endringer på din epub. Klag til epubcheck-prosjektet."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:19
+msgid ""
+"%prog [options] file.epub\n"
+"\n"
+"Fix common problems in EPUB files that can cause them to be rejected by "
+"poorly designed publishing services.\n"
+"\n"
+"By default, no fixing is done and messages are printed out for each error "
+"detected. Use the options to control which errors are automatically fixed."
+msgstr ""
+"%prog [valgmuligheter] file.epub\n"
+"\n"
+"Reparer vanlige problemer i EPUB-filer som kan føre til at de blir avvist "
+"for dårlig utført publiseringsservice.\n"
+"\n"
+"\n"
+"Som standard vil ikke reparasjoner bli utført og meldinger blir skrevet ut "
+"for hver feil som oppdages. Benytt valgmuligheter for å kontrollere hvilke "
+"feil som skal repareres automatisk."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:50
+msgid "You must specify an epub file"
+msgstr "Du må spesifisere en epub-fil"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:17
+msgid "Fix unmanifested files"
+msgstr "Reparer ikkemanifesterte filer"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:21
+msgid ""
+"Fix unmanifested files. epub-fix can either add them to the manifest or "
+"delete them as specified by the delete unmanifested option."
+msgstr ""
+"Reparer ikke-manifesterte filer. epub-fix kan enten legge dem til de "
+"manifesterte eller slette dem so spesifisert av slett ikkemanifesterte-"
+"valget."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:32
+msgid "Delete unmanifested files instead of adding them to the manifest"
+msgstr ""
+"Slett ikkemanefesterte file fremfor å legge dem til som manifesterte."
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:56
 msgid ""
 "Extract the contents of the generated EPUB file to the specified directory. "
@@ -2026,11 +2092,11 @@ msgstr "Tegneserie"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:98
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:882
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:887
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:543
 msgid "Title"
 msgstr "Tittel"
@@ -2039,7 +2105,7 @@ msgstr "Tittel"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:364
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:883
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:888
 msgid "Author(s)"
 msgstr "Forfatter(e)"
 
@@ -2062,7 +2128,7 @@ msgstr "Produsent"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:67
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:318
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1073
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1079
 msgid "Comments"
 msgstr "Sammendrag:"
 
@@ -2071,7 +2137,7 @@ msgstr "Sammendrag:"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:306
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1069
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1075
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:139
 msgid "Tags"
 msgstr "Nøkkelord"
@@ -2081,7 +2147,7 @@ msgstr "Nøkkelord"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:323
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1084
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:87
 msgid "Series"
 msgstr "Serie"
@@ -2091,7 +2157,7 @@ msgid "Language"
 msgstr "Språk"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:406
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1067
 msgid "Timestamp"
 msgstr "Tidstempel"
 
@@ -2364,7 +2430,7 @@ msgstr ""
 "i oversettelsen.\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1226
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1398
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1399
 msgid "Cover"
 msgstr "Omslagside"
 
@@ -2407,70 +2473,70 @@ msgstr "Alle artikler"
 msgid "This is an Amazon Topaz book. It cannot be processed."
 msgstr "Dette er en Amazon Topaz-bok. Den kan ikke koverteres."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1399
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1400
 msgid "Title Page"
 msgstr "Tittelside"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1400
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1401
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:15
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:53
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:194
 msgid "Table of Contents"
 msgstr "Innholdsfortegnelse"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1401
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1402
 msgid "Index"
 msgstr "Innhold"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1402
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1403
 msgid "Glossary"
 msgstr "Ordliste"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1403
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1404
 msgid "Acknowledgements"
 msgstr "Påskjønnelse"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1404
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1405
 msgid "Bibliography"
 msgstr "Litteraturliste"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1405
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1406
 msgid "Colophon"
 msgstr "Kolofon"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1406
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1407
 msgid "Copyright"
 msgstr "Opphavsrettighet"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1407
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1408
 msgid "Dedication"
 msgstr "Tilegnet"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1408
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1409
 msgid "Epigraph"
 msgstr "Epigraf"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1409
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1410
 msgid "Foreword"
 msgstr "Forord"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1410
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1411
 msgid "List of Illustrations"
 msgstr "Illustrasjonsliste"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1411
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1412
 msgid "List of Tables"
 msgstr "Tabell-liste"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1412
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1413
 msgid "Notes"
 msgstr "Merknader"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1413
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1414
 msgid "Preface"
 msgstr "Forord"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1414
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1415
 msgid "Main Text"
 msgstr "Hovedtekst"
 
@@ -2515,7 +2581,7 @@ msgstr "Sidepanel"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:22
 #: /home/kovid/work/calibre/src/calibre/ebooks/tcr/input.py:23
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:23
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:24
 msgid ""
 "Normally calibre treats blank lines as paragraph markers. With this option "
 "it will assume that every line represents a paragraph instead."
@@ -2525,7 +2591,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:26
 #: /home/kovid/work/calibre/src/calibre/ebooks/tcr/input.py:27
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:27
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:28
 msgid ""
 "Normally calibre treats blank lines as paragraph markers. With this option "
 "it will assume that every line starting with an indent (either a tab or 2+ "
@@ -2686,7 +2752,7 @@ msgstr ""
 "Motta informasjon om en PDF.\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
 msgid "Author"
 msgstr "Forfatter"
@@ -2859,7 +2925,7 @@ msgstr ""
 "den laveste kompresjonen men er raskest og 10 har den høyeste kompresjonen "
 "men den sakteste."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:33
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:34
 msgid ""
 "Normally extra spaces are condensed into a single space. With this option "
 "all spaces will be displayed."
@@ -2867,14 +2933,14 @@ msgstr ""
 "Vanligvis vil ekstraområder sees på som en enkeltlinje. Uten dette valget "
 "vil hele området bli vist."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:36
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:37
 msgid ""
 "Run the text input through the markdown pre-processor. To learn more about "
 "markdown see"
 msgstr ""
 "Kjør tekst inndata via markdown-forprosessor. For å lære med om markdown, se"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:39
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:40
 msgid "Do not insert a Table of Contents into the output text."
 msgstr "Legg aldri en liste over innhold til utdata-teksten."
 
@@ -3048,7 +3114,7 @@ msgstr "Kopier"
 msgid "Copy to Clipboard"
 msgstr "Kopier til utklippstavlen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:400
 msgid "Choose Files"
 msgstr "Velg filer"
 
@@ -3063,13 +3129,13 @@ msgid "User annotations generated from main library only"
 msgstr "Brukerkommentaer genereres kun fra hovedbiblioteket"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:75
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:612
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:671
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:708
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:729
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:877
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1060
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:670
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:707
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:728
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:876
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:941
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1059
 msgid "No books selected"
 msgstr "Ingen bøker ble valgt"
 
@@ -3109,144 +3175,144 @@ msgstr "Hvor mange tomme bøker?"
 msgid "How many empty books should be added?"
 msgstr "Hvor mange tomme bøker skal legges til?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:340
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:390
 msgid "Uploading books to device."
 msgstr "Laster opp bøker til enheten."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:350
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:137
 msgid "Books"
 msgstr "Bøker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
 msgid "EPUB Books"
 msgstr "EPUB bøker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
 msgid "LRF Books"
 msgstr "LRF bøker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
 msgid "HTML Books"
 msgstr "HTML-bøker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
 msgid "LIT Books"
 msgstr "LIT bøker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
 msgid "MOBI Books"
 msgstr "MOBI bøker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
 msgid "Topaz books"
 msgstr "Topaz-bøker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
 msgid "Text books"
 msgstr "Tekst bøker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:359
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
 msgid "PDF Books"
 msgstr "PDF-bøker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:359
 msgid "Comics"
 msgstr "Tegneserier"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:360
 msgid "Archives"
 msgstr "Arkiver"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:364
 msgid "Supported books"
 msgstr "Støttede bøker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:399
 msgid "Merged some books"
 msgstr "Slått sammen noen bøker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:401
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:400
 msgid ""
 "Some duplicates were found and merged into the following existing books:"
 msgstr ""
 "Noen duplikater ble funnet og slått sammen til følgende eksisterende bøker:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:409
 msgid "Failed to read metadata"
 msgstr "Kunne ikke lese metadata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:410
 msgid "Failed to read metadata from the following"
 msgstr "Kunne ikke lese metadata fra følgende"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:434
 msgid "Add to library"
 msgstr "Legg til i biblioteket"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:460
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1229
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:459
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1228
 msgid "No book selected"
 msgstr "Ingen bøker ble valgt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:434
 msgid "No book files found"
 msgstr "Ingen bokfiler ble funnet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:456
 msgid "Cannot delete"
 msgstr "Kan ikke fjerne"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:469
 msgid "Choose formats to be deleted"
 msgstr "Velg formater som skal fjernes"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:488
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:487
 msgid "Choose formats <b>not</b> to be deleted"
 msgstr "Velg formatet <b>ikke</b> til å slettes"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:507
 msgid "Cannot delete books"
 msgstr "Kan ikke slette bøker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:509
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:508
 msgid "No device is connected"
 msgstr "Ingen enheter er koblet til"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:519
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:518
 msgid "Main memory"
 msgstr "Hovedminne"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:520
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:444
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:519
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:454
 msgid "Storage Card A"
 msgstr "Lagring Kort A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:521
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:446
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:455
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:447
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:456
 msgid "Storage Card B"
 msgstr "Lagring Kort B"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:525
 msgid "No books to delete"
 msgstr "Ingen bøker å slette"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:526
 msgid "None of the selected books are on the device"
 msgstr "Ingen av de valgte bøkene finnes på enheten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:544
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:600
 msgid "Deleting books from device."
 msgstr "Sletter bøker fra enheten."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:564
 msgid ""
 "The selected books will be <b>permanently deleted</b> and the files removed "
 "from your computer. Are you sure?"
@@ -3254,68 +3320,68 @@ msgstr ""
 "De valgte bøkene vil bli <b>slettet permanent</b> og filene vil bli fjernet "
 "fra datamaskinen din. Er du sikker?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:585
 msgid ""
 "The selected books will be <b>permanently deleted</b> from your device. Are "
 "you sure?"
 msgstr ""
 "De valgte bøkene vil bli <b>slettet peremanent</b> fra enheten. Er du sikker?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:610
 msgid "Cannot download metadata"
 msgstr "Kan ikke laste ned metadata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:627
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
 msgid "social metadata"
 msgstr "sosiale metadata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
 msgid "covers"
 msgstr "Omslag"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
 msgid "metadata"
 msgstr "metadata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:630
 msgid "Downloading %s for %d book(s)"
 msgstr "Laster ned %s for %d bok(bøker)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:654
 msgid "Failed to download some metadata"
 msgstr "Klarte ikke å laste ned en del av metadataene"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:656
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
 msgid "Failed to download metadata for the following:"
 msgstr "Kunne ikke laste ned metadata for følgende:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:659
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:658
 msgid "Failed to download metadata:"
 msgstr "Kunne ikke laste ned metadata:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:660
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:637
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:522
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:949
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:659
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:638
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:951
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
 msgid "Error"
 msgstr "Feil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:670
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:707
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:669
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:706
 msgid "Cannot edit metadata"
 msgstr "Kan ikke redigere metadata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:728
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:731
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:727
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:730
 msgid "Cannot merge books"
 msgstr "Kan ikke slå sammen bøker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:732
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:731
 msgid "At least two books must be selected for merging"
 msgstr "Minst to bøker må velges for å slå sammen bøker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:736
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:735
 msgid ""
 "All book formats and metadata from the selected books will be added to the "
 "<b>first selected book.</b><br><br> The second and subsequently selected "
@@ -3327,7 +3393,7 @@ msgstr ""
 "ikke bli slettet eller endret.<br><br>Vennligst bekreft at du ønsker å "
 "fortsette."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:747
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:746
 msgid ""
 "All book formats and metadata from the selected books will be merged into "
 "the <b>first selected book</b>.<br><br>After merger the second and "
@@ -3343,7 +3409,7 @@ msgstr ""
 "valgte bøker vil bli <b>slettet</b> permanent fra din datamaskin.<br><br> Er "
 "du sikker på at du<b>vil</b> fortsette?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:759
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:758
 msgid ""
 "You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
 "proceed?"
@@ -3351,45 +3417,45 @@ msgstr ""
 "Du er i ferd med å slå sammen fler enn 5 bøker. Er du <b>sikker</b> på at du "
 "ønsker å fortsette?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:876
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:875
 msgid "Cannot save to disk"
 msgstr "Kan ikke lagre til disk"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:878
 msgid "Choose destination directory"
 msgstr "Velg mottaksmappe"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:912
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:911
 msgid "Error while saving"
 msgstr "Feil ved lagring"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:913
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:912
 msgid "There was an error while saving."
 msgstr "En feil oppsto ved lagring"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:919
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:920
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:921
 msgid "Could not save some books"
 msgstr "Kunne ikke lagre enkelte bøker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:922
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:921
 msgid "Click the show details button to see which ones."
 msgstr "Klikk vis detaljer knappen for å se hvilke."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
 msgid "No books selected to generate catalog for"
 msgstr "Ingen bøker ble valgt for å produsere kataloger"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:960
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:959
 msgid "Generating %s catalog..."
 msgstr "Produserer %s katalog..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:965
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:964
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:264
 msgid "No books found"
 msgstr "Ingen bøker ble funnet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:966
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:965
 msgid ""
 "No books to catalog\n"
 "Check exclude tags"
@@ -3397,49 +3463,49 @@ msgstr ""
 "Ingen bøker til katalog\n"
 "Sjekk utelatte emneord"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:976
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:975
 msgid "Catalog generated."
 msgstr "Katalog produsert."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:979
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:978
 msgid "Export Catalog Directory"
 msgstr "Eksporter katalogdirektorat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:980
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:979
 msgid "Select destination for %s.%s"
 msgstr "Velg plassering for %s.%s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:996
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:995
 msgid "Fetching news from "
 msgstr "Skaffer nyheter fra "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1009
 msgid " fetched."
 msgstr " funnet."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1059
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1058
 msgid "Cannot convert"
 msgstr "Kan ikke konvertere"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1088
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1087
 msgid "Starting conversion of %d book(s)"
 msgstr "Starter konverteringen av %d boken(bøkene)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1265
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1264
 msgid "Cannot view"
 msgstr "Kan ikke vise"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1209
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
 msgid "Choose the format to view"
 msgstr "Velg format som skal vises"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1218
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1217
 msgid "Multiple Books Selected"
 msgstr "Flere bøker ble valgt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1219
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1218
 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 "
@@ -3451,11 +3517,11 @@ msgstr ""
 "startet denne prosessen, kan den ikke stanses før den er fullført. Ønsker du "
 "å fortsette?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1227
 msgid "Cannot open folder"
 msgstr "Kan ikke åpne folder"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1266
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1265
 msgid "%s has no available formats."
 msgstr "%s har ikke tilgjengelig formater."
 
@@ -3480,7 +3546,7 @@ msgid "The specified directory could not be processed."
 msgstr "Den spesifiserte mappen kunne ikke prosesseres"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:845
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr "Ingen bøker"
 
@@ -3618,15 +3684,15 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:52
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:633
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:637
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:366
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:371
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:385
@@ -3650,12 +3716,12 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:259
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:265
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:186
@@ -3689,8 +3755,9 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:313
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1059
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1065
 msgid "Path"
 msgstr "Bane"
 
@@ -3707,8 +3774,8 @@ msgid "Formats"
 msgstr "Formater"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:25
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:886
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1062
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:891
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1068
 msgid "Collections"
 msgstr "Samlinger"
 
@@ -3721,12 +3788,12 @@ msgstr "Klikk for å åpne"
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:305
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:311
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:317
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1068
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1072
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1074
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:458
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:274
 msgid "None"
 msgstr "Ingen"
 
@@ -4614,12 +4681,12 @@ msgid "Footer regular expression:"
 msgstr "Bunntekst - vanlig uttrykk:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:56
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:76
 msgid "Invalid regular expression"
 msgstr "Ugyldig regulæruttrykk"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:77
 msgid "Invalid regular expression: %s"
 msgstr "Ugyldig regulæruttrykk: %s"
 
@@ -4838,11 +4905,11 @@ msgstr ""
 "om avansert bruk av XPath, se <a href=\"http://calibre-"
 "ebook.com/user_manual/xpath.html\">XPath Tutorial</a>."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:127
 msgid "Cover browser could not be loaded"
 msgstr "Omslagssøker kunne ikke starte"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:179
 msgid "Browse by covers"
 msgstr "Søk blant omslag"
 
@@ -4901,124 +4968,124 @@ msgstr "emneord som skal legges til"
 msgid "tags to remove"
 msgstr "emneord som skal fjernes"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:49
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:135
 msgid "No details available."
 msgstr "Ingen detaljer tilgjengelig."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:155
 msgid "Device no longer connected."
 msgstr "Enheten er ikke lenger koblet til."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:270
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:271
 msgid "Get device information"
 msgstr "Få informasjon om enheten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:282
 msgid "Get list of books on device"
 msgstr "Få en liste over bøker på enheten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:292
 msgid "Get annotations from device"
 msgstr "Motta kommentar fra enheten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:301
 msgid "Send metadata to device"
 msgstr "Send metadata til enheten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:305
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:306
 msgid "Send collections to device"
 msgstr "Overfør samlingene til enheten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:330
 msgid "Upload %d books to device"
 msgstr "Last opp %d bøker til enheten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:345
 msgid "Delete books from device"
 msgstr "Slett bøker fra enhet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:362
 msgid "Download books from device"
 msgstr "Last ned bøker fra enhet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:372
 msgid "View book on device"
 msgstr "Se min bok på enheten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:408
 msgid "Set default send to device action"
 msgstr "Sett stadart til send til enhet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:413
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:420
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:422
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:425
 msgid "Email to"
 msgstr "-post til"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:425
 msgid " and delete from library"
 msgstr " og slett fra biblioteket"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:434
 msgid "Send to main memory"
 msgstr "Send til hovedminnet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:436
 msgid "Send to storage card A"
 msgstr "Send til lagringskort A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:437
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:438
 msgid "Send to storage card B"
 msgstr "Send til lagringskort B"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:442
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:452
 msgid "Main Memory"
 msgstr "Hovedminne"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:469
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:470
 msgid "Send and delete from library"
 msgstr "Overfør og slett fra biblioteket"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:471
 msgid "Send specific format"
 msgstr "Overfør spesifisert format"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:509
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:510
 msgid "Connect to folder"
 msgstr "Knytt til mappe"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:516
 msgid "Connect to iTunes"
 msgstr "Koble til iTunes"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:521
 msgid "Eject device"
 msgstr "Koble fra enhet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:529
 msgid "Fetch annotations (experimental)"
 msgstr "Hent kommentarer (eksperimentell)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:638
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:639
 msgid "Error communicating with device"
 msgstr "Feil ved kommunikasjonen med enheten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:659
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:660
 msgid "Select folder to open as device"
 msgstr "Velg mappe som skal åpnes som enhet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:704
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:705
 msgid "Failed"
 msgstr "Mislykket"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:710
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:711
 msgid "Error talking to device"
 msgstr "Feil ved komminikasjonen med enheten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:711
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:712
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -5026,124 +5093,120 @@ msgstr ""
 "En midlertidig feil oppsto ved kommunikasjonen med enheten. Vennligst plugg "
 "ut og plugg inn igjen enheten, eller ta en omstart."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:753
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:754
 msgid "Device: "
 msgstr "Enhet: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:755
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:756
 msgid " detected."
 msgstr " Funnet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:778
-msgid "Connected "
-msgstr "Tilkoblet "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:846
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr "Velg for å sende"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:851
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:847
 msgid "Choose format to send to device"
 msgstr "Velg format for å sende til enhet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:860
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:856
 msgid "No device"
 msgstr "Ingen enhet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:857
 msgid "Cannot send: No device is connected"
 msgstr "Kan ikke sende: Ingen enhet er koblet til"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:860
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:868
 msgid "No card"
 msgstr "Ingen kort"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:869
 msgid "Cannot send: Device has no storage card"
 msgstr "Kan ikke sende: Enheten har ikke noe lagringskort"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:910
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:906
 msgid "E-book:"
 msgstr "E-bok"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:913
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:909
 msgid "Attached, you will find the e-book"
 msgstr "Vedlagt finner du e-boken"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:910
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:181
 msgid "by"
 msgstr "av"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:915
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:911
 msgid "in the %s format."
 msgstr "i %s format"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:928
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:924
 msgid "Sending email to"
 msgstr "Sender e-post til"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:958
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:965
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1057
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1118
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1236
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:954
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:962
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1054
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1235
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:1243
 msgid "No suitable formats"
 msgstr "Ingen passende formater"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:959
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:955
 msgid "Auto convert the following books before sending via email?"
 msgstr "Autokonverter de følgende bøkene før du sender dem via e-post?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:966
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:963
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 "Kunne ikke sende følgende bøker som e-post da ingen passende formater ble "
 "funnet:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:984
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:981
 msgid "Failed to email books"
 msgstr "Kunne ikke sende bøker via e-post"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:985
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:982
 msgid "Failed to email the following books:"
 msgstr "Kunne ikke sende de følgende bøkene via e-post:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:989
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:986
 msgid "Sent by email:"
 msgstr "Sent som e-post:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1016
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1013
 msgid "News:"
 msgstr "Nyheter:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1017
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1014
 msgid "Attached is the"
 msgstr "Vedlagt følger"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1028
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1025
 msgid "Sent news to"
 msgstr "Sent nyheter til"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1058
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1237
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1055
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1117
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1236
 msgid "Auto convert the following books before uploading to the device?"
 msgstr "Autokonverter følgende bøker før du laster dem opp til enheten?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1087
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1085
 msgid "Sending catalogs to device."
 msgstr "Sender kataloger til enheten."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1150
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1149
 msgid "Sending news to device."
 msgstr "Sender nyheter til enheten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1202
 msgid "Sending books to device."
 msgstr "Sender bøker til enheten."
 
@@ -5200,7 +5263,7 @@ msgid "My Books"
 msgstr "Mine bøker"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:69
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:289
 msgid "Generate catalog"
 msgstr "Produser katalog"
 
@@ -5342,11 +5405,11 @@ msgstr "Bred"
 msgid "Narrow"
 msgstr "Reduser"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:503
 msgid "System port selected"
 msgstr "Valgt systemport"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:503
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:504
 msgid ""
 "The value <b>%d</b> you have chosen for the content server port is a system "
 "port. Your operating system <b>may</b> not allow the server to run on this "
@@ -5357,131 +5420,131 @@ msgstr ""
 "via denne porten. For å være sikker, velg et portnummer som er høyere enn "
 "1024."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:524
 msgid "Failed to install command line tools."
 msgstr "Kunne ikke installere kommandolinjeverktøy."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:527
 msgid "Command line tools installed"
 msgstr "Kommandolinjeverktøy installert"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:528
 msgid "Command line tools installed in"
 msgstr "Kommandolinjeverktøy ble installert i"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:529
 msgid ""
 "If you move calibre.app, you have to re-install the command line tools."
 msgstr ""
 "Dersom du flytter calibre.app, må du re-installere kommandolinjeverktøyene."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:580
 msgid "No valid plugin path"
 msgstr "Ingen gyldig programtillegsbane"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:581
 msgid "%s is not a valid plugin path"
 msgstr "%s er ikke en gyldig bane for programtillegget"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:584
 msgid "Choose plugin"
 msgstr "Velg programtillegg"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:596
 msgid "Plugin cannot be disabled"
 msgstr "Programtillegget kan ikke slåes av"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:597
 msgid "The plugin: %s cannot be disabled"
 msgstr "Programtillegget: %s kan ikke slåes av"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:606
 msgid "Plugin not customizable"
 msgstr "Programtillegg ikke egendefinert"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:607
 msgid "Plugin: %s does not need customization"
 msgstr "Programtillegg: %s trenger ikke å egendefineres"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:615
 msgid "Customize"
 msgstr "Tilpass"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:652
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:653
 msgid "Cannot remove builtin plugin"
 msgstr "Kan ikke fjerne innebygget programtillegg"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:653
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:654
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 " kan ikke fjernes. Dette er et innebygget programtillegg. Forsøk å slå det "
 "av istedet."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:684
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:685
 msgid "You must select a column to delete it"
 msgstr "Du må velge en kolonne for å slette den"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:690
 msgid "The selected column is not a custom column"
 msgstr "Den valgte kolonnen er ikke en tilpasset kolonne"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:690
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:691
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
 msgid "Are you sure?"
 msgstr "Er du sikker?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:691
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:692
 msgid "Do you really want to delete column %s and all its data?"
 msgstr "Ønsker du virkelig å slette kolonne %s og alle dataene i den?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:758
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:759
 msgid "Error log:"
 msgstr "Feil-logg:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:765
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:766
 msgid "Access log:"
 msgstr "tilgangslogg:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:793
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:794
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:331
 msgid "Failed to start content server"
 msgstr "Kunne ikke starte innholdsserveren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:817
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:818
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:587
 msgid "Select location for books"
 msgstr "Velg lokalisasjon for bøker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:824
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:825
 msgid "Invalid size"
 msgstr "Ugyldig størrelse"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:825
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:826
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr "Størrelsen %s er ugyldig. må være i formatet breddexhøyde"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:884
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:889
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:891
 msgid "Invalid database location"
 msgstr "Ugyldig lokalisering av databasen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:885
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:887
 msgid "Invalid database location "
 msgstr "Ugyldig lokalisering av databasen "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:888
 msgid "<br>Must be a directory."
 msgstr "<br>Må være en katalog."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:890
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:892
 msgid "Invalid database location.<br>Cannot write to "
 msgstr "Ugyldig lokalisering av databasen.<br>Kan ikke skrive til "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:895
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:897
 msgid "Must restart"
 msgstr "Omstart behøves"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:896
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:898
 msgid ""
 "The changes you made require that Calibre be restarted. Please restart as "
 "soon as practical."
@@ -5489,19 +5552,19 @@ msgstr ""
 "Endringene du har utført krever omstart av Calibre. Vennligst kjør omstart "
 "så snart du kan."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:930
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:932
 msgid "Checking database integrity"
 msgstr "Sjekker databasens integritet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:950
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:952
 msgid "Failed to check database integrity"
 msgstr "Kunne ikke sjekke databasens integritet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:957
 msgid "Some inconsistencies found"
 msgstr "Noen uoverensstemmelser ble funnet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:956
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:958
 msgid ""
 "The following books had formats listed in the database that are not actually "
 "available. The entries for the formats have been removed. You should check "
@@ -5513,11 +5576,11 @@ msgstr ""
 "dem manuelt. Dette kan skje dersom du har manipulert filene i "
 "bibliotekfolderen direkte."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:133
 msgid "TabWidget"
 msgstr "TabWidget"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:134
 msgid ""
 "Here you can control how calibre will read metadata from the files you add "
 "to it. calibre can either read metadata from the contents of the file, or "
@@ -5527,11 +5590,11 @@ msgstr ""
 "lagt til. Calibre kan enten lese metadata fra filens innhold, eller fra "
 "filnavnet."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:135
 msgid "Read metadata only from &file name"
 msgstr "Les metadata kun fra &filnavn"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:136
 msgid ""
 "Swap the firstname and lastname of the author. This affects only metadata "
 "read from file names."
@@ -5539,11 +5602,11 @@ msgstr ""
 "Bytt mellom fornavn og etternavn på forfatteren. Dette berører kun metadata "
 "fra filnavnet."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:137
 msgid "&Swap author firstname and lastname"
 msgstr "&Bytt mellom forfatterens fornavn og etternavn"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:138
 msgid ""
 "If an existing book with a similar title and author is found that does not "
 "have the format being added, the format is added\n"
@@ -5562,7 +5625,7 @@ msgstr ""
 "Titteltreff ignorerer ledende udefinerte artikler /\"the\", \"a\", \"an\"). "
 "punktum, sak, osv. Forfattertreff er nøyaktig."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:142
 msgid ""
 "If books with similar titles and authors found, &merge the new files "
 "automatically"
@@ -5570,15 +5633,15 @@ msgstr ""
 "Dersom bøker med likelydende titler og forfattere finnes, &slå filene sammen "
 "til ett automatisk"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:143
 msgid "&Configure metadata from file name"
 msgstr "&Konfigurer metadata fra filnavn"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:144
 msgid "&Adding books"
 msgstr "&Legg til bøker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:145
 msgid ""
 "Here you can control how calibre will save your books when you click the "
 "Save to Disk button:"
@@ -5586,65 +5649,70 @@ msgstr ""
 "Her kan du kontrollere hvordan Calibre skal lagre bøkene dine når du klikker "
 "på Lagre til Lagringsenhetknappen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:146
 msgid "Save &cover separately"
 msgstr "Lagre &omslag separat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:147
 msgid "Update &metadata in saved copies"
 msgstr "Oppdater &metadata i lagrede kopier"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:148
 msgid "Save metadata in &OPF file"
 msgstr "Lagre metadata i &OPF fil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:149
 msgid "Convert non-English characters to &English equivalents"
 msgstr "Konverter ikke-engelske bokstaver til &engelskspråklige bokstaver"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:150
 msgid "Format &dates as:"
 msgstr "Formater &datoer som:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:151
 msgid "File &formats to save:"
 msgstr "Fil &format som skal lagres:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:152
 msgid "Replace space with &underscores"
 msgstr "Erstatt mellomrom med &understrek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:153
 msgid "Change paths to &lowercase"
 msgstr "Forandre stier til &små bokstaver"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:154
 msgid "&Saving books"
 msgstr "&Lagrer bøker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:135
-msgid "Preserve device collections."
-msgstr "Behold enhetssamlinger."
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:155
+msgid "Metadata &management:"
+msgstr "Metadata &kontrollsenter:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:136
-msgid ""
-"If checked, collections will not be deleted even if a book with changed "
-"metadata is resent and the collection is not in the book's metadata. In "
-"addition, editing collections in the device view will be enabled. If "
-"unchecked, collections will be always reflect only the metadata in the "
-"calibre library."
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:156
+msgid "Manual management"
 msgstr ""
-"Om merket av, vil samlinger ikke bli slettet, selv om en bok med endrede "
-"metadata er sent på nytt og samlingen ikke finnes i bokens metadata. I "
-"tillegg vil endring av samlingen i enhetens leser bli slått på. Om ikke "
-"merket av, vil samlingen bare reflektere metadata som finnes i calibre-"
-"biblioteket."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:137
-msgid "  "
-msgstr "  "
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:157
+msgid "Only on send"
+msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:158
+msgid "Automatic management"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:159
+msgid ""
+"<li><b>Manual Management</b>: Calibre updates the metadata and adds "
+"collections only when a book is sent. With this option, calibre will never "
+"remove a collection.</li>\n"
+"<li><b>Only on send</b>: Calibre updates metadata and adds/removes "
+"collections for a book only when it is sent to the device. </li>\n"
+"<li><b>Automatic management</b>: Calibre automatically keeps metadata on the "
+"device in sync with the calibre library, on every connect</li></ul>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:162
 msgid ""
 "Here you can control how calibre will save your books when you click the "
 "Send to Device button. This setting can be overriden for individual devices "
@@ -5655,18 +5723,19 @@ msgstr ""
 "individuelle enheter ved å tilpasse enhetens programtillegg for grensesnitt "
 "under: Innstillinger->Programtillegg"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:163
 msgid "Sending to &device"
 msgstr "Sender til &enheten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:167
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:174
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr "Innstillinger"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
@@ -5674,28 +5743,28 @@ msgstr ""
 "&Lokalisering av e-bøker (e-bøkene er lagret i foldere sortert etter "
 "forfattere og metadata er lagret i filen metadata.db)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
 msgid "Browse for the new database location"
 msgstr "Søk etter den nye databaselokaliseringen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
 msgid "Show notification when &new version is available"
 msgstr "Varsle når &ny versjon er tilgjengelig"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
 msgid "Download &social metadata (tags/ratings/etc.) by default"
 msgstr "Last ned &sosiale metadata (emneord/vurdering/osv.) som standard"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
 msgid "&Overwrite author and title by default when fetching metadata"
 msgstr ""
 "&Overskriv forfatter og tittel med standard når du laster ned metadata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
 msgid "Default network &timeout:"
 msgstr "Standard netttilgang &tidsavbrudd:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
@@ -5703,152 +5772,156 @@ msgstr ""
 "Legg inn standard for tidsavbrudd for nettverkstilgang (for eksempel all den "
 "tid vi går på nettet for å finne informasjon)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
 msgid " seconds"
 msgstr " sekunder"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
 msgid "Choose &language (requires restart):"
 msgstr "Velg &språk (krever omstart):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
 msgid "Normal"
 msgstr "Vanlig"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
 msgid "High"
 msgstr "Høy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
 msgid "Low"
 msgstr "Lav"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
 msgid "Job &priority:"
 msgstr "oppgave&prioritet:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
 msgid "Preferred &output format:"
 msgstr "Foretrukket &utdataformat:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
 msgid "Preferred &input format order:"
 msgstr "Foretrukket &inndataformat:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
 msgid "Use &Roman numerals for series number"
 msgstr "Bruk &Romerske tall for seriell numerering"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
 msgid "Enable system &tray icon (needs restart)"
 msgstr "Slå på oppgave&panelikonet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
 msgid "Show &notifications in system tray"
 msgstr "Vis &varsler i oppgavepanelet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
 msgid "Show &splash screen at startup"
 msgstr "Vis &splash bilde når enheten starter"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr "Vis omslag &søk i eget vindu (krever omstart)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
 msgid "Show &average ratings in the tags browser"
 msgstr "Vis &gjennomsnittlig vurdering i emneordssøkeren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
 msgid "Search as you type"
 msgstr "Søk mens du taster"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr "Send nedlastede &nyheter til eBokleseren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
 msgid "&Delete news from library when it is automatically sent to reader"
 msgstr "&Slett nyheter fra biblioteket når de automatisk sendes til leseren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr "&Antall omslag som skal vises i søkemodus (krever omstart):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
 msgid "Toolbar"
 msgstr "Verktøylinje"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
 msgid "Large"
 msgstr "Store"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
 msgid "Medium"
 msgstr "Medium"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
 msgid "Small"
 msgstr "Små"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
 msgid "&Button size in toolbar"
 msgstr "&Knappestørrelse i verktøylinjen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
 msgid "Show &text in toolbar buttons"
 msgstr "Vis &tekst i verktøylinjens knapper"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
 msgid "Select visible &columns in library view"
 msgstr "Velg synlige &kolonner i bibliotekvisningsmodus"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
 msgid "Remove a user-defined column"
 msgstr "Fjern en brukerdefinert kolonne"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
 msgid "Add a user-defined column"
 msgstr "Legg til en brukerdefinert kolonne"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
 msgid "Edit settings of a user-defined column"
 msgstr "Rediger innstillinger for en brukerdefinert kolonne"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
 msgid "Use internal &viewer for:"
 msgstr "Bruk intern &leser for:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
 msgid "User Interface &layout (needs restart):"
 msgstr "Brukergrensesnitt &visning (krever omstart):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 "Slå av alle animeringer. Nyttig dersom du har en svak/eldre datamaskin."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
 msgid "Disable &animations"
 msgstr "Slå av &animeringer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
+msgid "Show &donate button (restart)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
 msgid "Add an email address to which to send books"
 msgstr "Legg til en e-postadresse til hvor du vil sende bøker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
 msgid "&Add email"
 msgstr "&Legg til e-post"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
 msgid "Make &default"
 msgstr "Lag &standard"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
 msgid "&Remove email"
 msgstr "&Fjern e-post"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
 msgid ""
 "calibre can send your books to you (or your reader) by email. Emails will be "
 "automatically sent for downloaded news to all email addresses that have Auto-"
@@ -5858,32 +5931,32 @@ msgstr ""
 "automatisk bli sent til nedlastede nyheter til alle e-postadressende som har "
 "blitt merket av for autosend."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
 msgid "&Maximum number of waiting worker processes (needs restart):"
 msgstr "&Maximum antall ventende arbeidsprosesser (omstart behøves):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
 msgid "&Check database integrity"
 msgstr "&Sjekk databasens integritet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
 msgid "&Install command line tools"
 msgstr "&Installer kommandolinjeverktøy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
 msgid "Open calibre &configuration directory"
 msgstr "Åpne Calibre&konfigurasjonsmappen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
 msgid "Limit the max. simultaneous jobs to the available CPU &cores"
 msgstr ""
 "Begrens maksimalt antall samtidige oppgaver til verdien av CPU &cores"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
 msgid "Debug &device detection"
 msgstr "Feilsøking &enhetsgjenkjenning"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
 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 "
@@ -5893,25 +5966,25 @@ msgstr ""
 "ved å benytte en nettleser fra hvilket som helst sted i verden. Enhver "
 "forandring av innstillingene vil taes ibruk etter en omstart av serveren."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
 msgid "Server &port:"
 msgstr "Server &port:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:212
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:117
 msgid "&Username:"
 msgstr "&Brukernavn:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:213
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:119
 msgid "&Password:"
 msgstr "&Passord:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
@@ -5919,7 +5992,7 @@ msgstr ""
 "Dersom du lar passordet stå tomt, vil enhver kunne gå inn i din boksamling "
 "ved å benytte web-brukergrensesnittet."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
@@ -5927,45 +6000,45 @@ msgstr ""
 "Maksimal størrelse (breddexhøyde) for å vise omslag. Større omslag vil bli "
 "re-dimensjonert. "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
 msgid "Max. &cover size:"
 msgstr "Maks. &omslagsstørrelse:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:621
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:214
 msgid "&Show password"
 msgstr "&Vis passord"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
 msgid "Max. &OPDS items per query:"
 msgstr "Maksimum &OPDS enheter per spørring:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
 msgid "Max. OPDS &ungrouped items:"
 msgstr "Maks OPDS &undergruppert innhold"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
 msgid "&Start Server"
 msgstr "&Start server"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:621
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
 msgid "St&op Server"
 msgstr "St&op server"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:626
 msgid "&Test Server"
 msgstr "&Test server"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
 msgid "Run server &automatically on startup"
 msgstr "Kjør server &automatisk ved oppstart"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:628
 msgid "View &server logs"
 msgstr "Vis &serverlogger"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:46
 msgid ""
 "<p>Remember to leave calibre running as the server only runs as long as "
@@ -5982,7 +6055,7 @@ msgstr ""
 "din iPhone. Her skal myhostname være fullt kvalifisert vertsnavn eller IP-"
 "adressen til datamaskinen Calibre kjører på."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:631
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
@@ -5990,27 +6063,27 @@ msgstr ""
 "Her kan du skreddersy Calibres atferd ved å kontrollere hvilke "
 "programtillegg som skal benyttes."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:628
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:632
 msgid "Enable/&Disable plugin"
 msgstr "Slå på/&Slå av programtillegg"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:633
 msgid "&Customize plugin"
 msgstr "&Skreddersy programtillegg"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:630
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:634
 msgid "&Remove plugin"
 msgstr "&Fjern programtillegg"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:635
 msgid "Add new plugin"
 msgstr "Legg til nytt programtillegg"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:632
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:636
 msgid "Plugin &file:"
 msgstr "Programtillegg &fil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:634
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:638
 msgid "&Add"
 msgstr "&Legg til"
 
@@ -6048,9 +6121,9 @@ msgstr "Nummer"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:31
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:884
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:889
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Date"
 msgstr "Dato"
@@ -6260,12 +6333,18 @@ msgstr "&Vis dette varselet igjen"
 msgid "ERROR"
 msgstr "Feilmelding"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:67
+msgid ""
+"All checked books will be <b>permanently deleted</b> from your device. "
+"Please verify the list."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 msgid "Location"
 msgstr "Lokalisering"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1058
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1064
 msgid "Format"
 msgstr "Format"
 
@@ -7105,6 +7184,10 @@ msgid "Add tag to available tags and apply it to current book"
 msgstr ""
 "Legg nye emneord til tilgjengelige emneord og legg dem til gjeldende bok"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:20
+msgid "%s (was %s)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:501
 msgid "Item is blank"
@@ -7433,11 +7516,11 @@ msgstr "Regulære uttrykk (?P&lt;tittel&gt;)"
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:88
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:93
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:98
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:100
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:99
 msgid "No match"
 msgstr "Ingen treff"
 
@@ -7477,43 +7560,43 @@ msgstr "Regulært uttrykk (?P<isbn>)"
 msgid "Save single format to disk..."
 msgstr "Lagre et enkelt format til lagringsenhet..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:53
 msgid "Edit metadata individually"
 msgstr "Rediger metadata individuelt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:56
 msgid "Edit metadata in bulk"
 msgstr "Rediger metadata samlet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:59
 msgid "Download metadata and covers"
 msgstr "Last ned metadata og omslag"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:62
 msgid "Download only metadata"
 msgstr "Last kun ned metadata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:64
 msgid "Download only covers"
 msgstr "Last kun ned omslag"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:67
 msgid "Download only social metadata"
 msgstr "Last kun ned sosiale metadata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:73
 msgid "Merge into first selected book - delete others"
 msgstr "Slå sammen med første valgte bok - slett øvrige"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:76
 msgid "Merge into first selected book - keep others"
 msgstr "Slå sammen med første valgte bok - behold øvrige"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:84
 msgid "Add books from a single directory"
 msgstr "Legg til bøker fra en enkelt mappe"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:86
 msgid ""
 "Add books from directories, including sub-directories (One book per "
 "directory, assumes every ebook file is the same book in a different format)"
@@ -7521,7 +7604,7 @@ msgstr ""
 "Legg til bøker fra mapper, inkludert undermapper (En bok per mappe, "
 "oppfattes som at alle e-bokfilene er den samme boken i forskjellige format)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:90
 msgid ""
 "Add books from directories, including sub directories (Multiple books per "
 "directory, assumes every ebook file is a different book)"
@@ -7529,98 +7612,116 @@ msgstr ""
 "Legg til bøker fra mappene, inkludert undermapper (Flere bøker per mappe "
 "oppfattes som at alle e-bokfilene er forskjellige bøker)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:93
 msgid "Add Empty book. (Book entry with no formats)"
 msgstr "Legg til tom bok (Uformatert bokoppføring)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:102
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:160
 msgid "Save to disk"
 msgstr "Lagre til disk"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Save to disk in a single directory"
 msgstr "Lagre til disk i en enkelt mappe"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:106
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:402
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:393
 msgid "Save only %s format to disk"
 msgstr "Lagre kun %s format til disken"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:110
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:396
 msgid "Save only %s format to disk in a single directory"
 msgstr "Lagre kun %s formatet til disken i en enkelt mappe"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:119
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:166
 msgid "View"
 msgstr "Vis"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:121
 msgid "View specific format"
 msgstr "Vis spesifikt format"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:127
 msgid "Remove selected books"
 msgstr "Fjern valgte bøker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:129
 msgid "Remove files of a specific format from selected books.."
 msgstr "Fjern filer for et spesifisert format fra valgte bøker..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:132
 msgid "Remove all formats from selected books, except..."
 msgstr "Fjern alle formater fra valgte bøker, unntatt..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:135
 msgid "Remove covers from selected books"
 msgstr "Fjern omslag fra valgte bøker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:138
 msgid "Remove matching books from device"
 msgstr "Fjern samsvarende bøker fra enheten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:155
 msgid "Convert individually"
 msgstr "Konverter individuelt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:157
 msgid "Bulk convert"
 msgstr "Samlet konvertering"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:161
 msgid "Create catalog of books in your calibre library"
 msgstr "Lag en katalog av bøker i calibre-biblioteket ditt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:169
 msgid "Run welcome wizard"
 msgstr "Kjør velkomstveiviser"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:191
 msgid "Similar books..."
 msgstr "Samsvarende bøker..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:223
 msgid "Add books to library"
 msgstr "Legg bøker til biblioteket"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:234
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:241
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:239
 msgid "Manage collections"
 msgstr "Behandle samlinger"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:328
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:319
 msgid "Cover Browser"
 msgstr "Omslagssøker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:337
 msgid "Tag Browser"
 msgstr "Emneordsøker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:358
+msgid "version"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:359
+msgid "created by Kovid Goyal"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:377
+msgid "Connected "
+msgstr "Tilkoblet "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:386
+msgid "Update found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:430
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:439
 msgid "Book Details"
 msgstr "Bokdetaljer"
 
@@ -7683,6 +7784,223 @@ msgstr "Klikk for å se en liste over aktive oppgaver."
 msgid " - Jobs"
 msgstr " - Oppgave"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:64
+msgid ""
+"Library\n"
+"%d books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:65
+msgid ""
+"Reader\n"
+"%s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:66
+msgid ""
+"Card A\n"
+"%s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:67
+msgid ""
+"Card B\n"
+"%s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:71
+msgid "Click to see the books available on your computer"
+msgstr "Klikk for å se hvilke bøker som er tilgjengelige på datamaskinen din"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:74
+msgid "Click to see the books in the main memory of your reader"
+msgstr "Klikk for å se bøker som ligger i hovedminnet til lesplaten din"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:75
+msgid "Click to see the books on storage card A in your reader"
+msgstr ""
+"Klikk for å se bøker som er lagret til lagringskort A på leseplaten din"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:76
+msgid "Click to see the books on storage card B in your reader"
+msgstr ""
+"Klikk for å se bøker som er lagret til lagringskort B på leseplaten din"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:84
+msgid "Books located at"
+msgstr "Bøker lokalisert ved"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:100
+msgid "free"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:134
+msgid ""
+"Books display will be restricted to those matching the selected saved search"
+msgstr ""
+"Bokvisning vil begrenses til dem som samsvarer med de valgte lagrede søkene"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:136
+msgid "Advanced search"
+msgstr "Avansert søk"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:141
+msgid ""
+"<p>Search the list of books by title, author, publisher, tags, comments, "
+"etc.<br><br>Words separated by spaces are ANDed"
+msgstr ""
+"<p>Søk i listen over bøker etter tittel, forfatter, forlegger, emneord, "
+"kommentarer osv.<br><br>Ord delt med mellomrom forstås som OG"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:142
+msgid "Reset Quick Search"
+msgstr "Tilbakestill hurtigsøk"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:328
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:144
+msgid "Copy current search text (instead of search name)"
+msgstr "Kopier gjeldende søketekst (istedet for søkenavn)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:146
+msgid "Save current search under the name shown in the box"
+msgstr "Lagre gjledende søk under navnet som viser i boksen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:148
+msgid "Delete current saved search"
+msgstr "Slett gjeldende lagrete søk"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:150
+msgid "Add books"
+msgstr "Legg til bøker"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:151
+msgid "A"
+msgstr "A"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:153
+msgid "Remove books"
+msgstr "Fjern bøker"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:154
+msgid "Del"
+msgstr "Slett"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:406
+msgid "Edit meta info"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:406
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:156
+msgid "E"
+msgstr "E"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:157
+msgid "Merge book records"
+msgstr "Slå sammen bokoppføringer"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:158
+msgid "M"
+msgstr "M"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:159
+msgid "Send to device"
+msgstr "Send til enhet"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:161
+msgid "S"
+msgstr "S"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:162
+msgid "Fetch news"
+msgstr "Hent nyheter"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:163
+msgid "F"
+msgstr "F"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:164
+msgid "Convert books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:165
+msgid "C"
+msgstr "C"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:167
+msgid "V"
+msgstr "V"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:168
+msgid "Open containing folder"
+msgstr "Åpne innholdsfolder"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:169
+msgid "Show book details"
+msgstr "Vis bokdetaljer"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:170
+msgid "Books by same author"
+msgstr "Bøker av samme forfatter"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:171
+msgid "Books in this series"
+msgstr "Bøker i denne serien"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:172
+msgid "Books by this publisher"
+msgstr "Bøker av dette forlaget"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:173
+msgid "Books with the same tags"
+msgstr "Bøker med de samme taggene"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:176
+msgid "Ctrl+P"
+msgstr "Ctrl+P"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:177
+msgid "Help"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:178
+msgid "Browse the calibre User Manual"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:179
+msgid "F1"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:284
 msgid "N"
 msgstr "N"
@@ -7704,29 +8022,29 @@ msgid "Rating"
 msgstr "Rangering"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:324
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1084
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr "Bok <karaktersett=\"serif\">%s</font> of %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:674
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1176
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1182
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
 msgid "The lookup/search name is \"{0}\""
 msgstr "Søkenavnet er  \"{0}\""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:886
 msgid "In Library"
 msgstr "I biblioteket"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:885
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:890
 msgid "Size"
 msgstr "Størrelse"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1156
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1162
 msgid "Marked for deletion"
 msgstr "Merket for sletting"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1165
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr "Dobbelklikk til <b>rediger</b> me<br><br>"
 
@@ -7770,11 +8088,11 @@ msgstr "Vis kolonne"
 msgid "Restore default layout"
 msgstr "Gjenopprett standard visning"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:524
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:525
 msgid "Not allowed"
 msgstr "Ikke tillatt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:526
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
@@ -7979,158 +8297,34 @@ msgstr "forsøk å re-starte datamaskinen"
 msgid "try deleting the file"
 msgstr "forsøk å slette filen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:131
 msgid "calibre"
 msgstr "calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:133
 msgid "&Restrict to:"
 msgstr "&Begrens til:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
-msgid ""
-"Books display will be restricted to those matching the selected saved search"
-msgstr ""
-"Bokvisning vil begrenses til dem som samsvarer med de valgte lagrede søkene"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:135
 msgid "set in ui.py"
 msgstr "set in ui.py"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
-msgid "Advanced search"
-msgstr "Avansert søk"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:138
 msgid "Alt+S"
 msgstr "Alt+S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:139
 msgid "&Search:"
 msgstr "&Søk:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
-msgid ""
-"<p>Search the list of books by title, author, publisher, tags, comments, "
-"etc.<br><br>Words separated by spaces are ANDed"
-msgstr ""
-"<p>Søk i listen over bøker etter tittel, forfatter, forlegger, emneord, "
-"kommentarer osv.<br><br>Ord delt med mellomrom forstås som OG"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
-msgid "Reset Quick Search"
-msgstr "Tilbakestill hurtigsøk"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
-msgid "Choose saved search or enter name for new saved search"
-msgstr "Velg lagret søk eller skriv inn navnet for nytt lagret søk"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
-msgid "Copy current search text (instead of search name)"
-msgstr "Kopier gjeldende søketekst (istedet for søkenavn)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
-msgid "Save current search under the name shown in the box"
-msgstr "Lagre gjledende søk under navnet som viser i boksen"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
-msgid "Delete current saved search"
-msgstr "Slett gjeldende lagrete søk"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
-msgid "Add books"
-msgstr "Legg til bøker"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
-msgid "A"
-msgstr "A"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
-msgid "Remove books"
-msgstr "Fjern bøker"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
-msgid "Del"
-msgstr "Slett"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:155
 msgid "Edit meta information"
 msgstr "Rediger metadata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
-msgid "E"
-msgstr "E"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
-msgid "Merge book records"
-msgstr "Slå sammen bokoppføringer"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
-msgid "M"
-msgstr "M"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
-msgid "Send to device"
-msgstr "Send til enhet"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
-msgid "S"
-msgstr "S"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
-msgid "Fetch news"
-msgstr "Hent nyheter"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
-msgid "F"
-msgstr "F"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
-msgid "Convert E-books"
-msgstr "Konverter e-bøker"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
-msgid "C"
-msgstr "C"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
-msgid "V"
-msgstr "V"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
-msgid "Open containing folder"
-msgstr "Åpne innholdsfolder"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
-msgid "Show book details"
-msgstr "Vis bokdetaljer"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
-msgid "Books by same author"
-msgstr "Bøker av samme forfatter"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
-msgid "Books in this series"
-msgstr "Bøker i denne serien"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
-msgid "Books by this publisher"
-msgstr "Bøker av dette forlaget"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
-msgid "Books with the same tags"
-msgstr "Bøker med de samme taggene"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:175
 msgid "Configure calibre"
 msgstr "Konfigurer calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
-msgid "Ctrl+P"
-msgstr "Ctrl+P"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:20
 msgid ""
 "Redirect console output to a dialog window (both stdout and stderr). Useful "
@@ -8159,32 +8353,41 @@ msgstr "Boken har verken tittel eller ISBN"
 msgid "No matches found for this book"
 msgstr "Ingen treff ble funnet for denne boken"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:91
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:553
 msgid "Search"
 msgstr "Søk"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:313
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:315
 msgid "The selected search will be <b>permanently deleted</b>. Are you sure?"
 msgstr "Det valgte søket vil bli <b>permanent slettet</b>. Er du sikker?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:357
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr "Søk (For avansert søk, klikk på knappen til venstre)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:392
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:398
 msgid "Saved Searches"
 msgstr "Lagrete søk"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:406
+msgid "Choose saved search or enter name for new saved search"
+msgstr "Velg lagret søk eller skriv inn navnet for nytt lagret søk"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:10
+msgid "Restrict to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:48
 msgid "({0} of {1})"
 msgstr "({0} av {1})"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
 msgid "(all books)"
 msgstr "(Alle bøker)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:56
 msgid "({0} of all)"
 msgstr "({0} av alle)"
 
@@ -8307,18 +8510,31 @@ msgstr "Sorter etter popularitet"
 msgid "Sort by average rating"
 msgstr "Sorter etter gjennomsnittsbedømning"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:775
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:772
+msgid "Set the sort order for entries in the Tag Browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:778
 msgid "Match all"
 msgstr "Sammenlign alle"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:775
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:778
 msgid "Match any"
 msgstr "Sammenlign hviklet som helst"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:783
+msgid ""
+"When selecting multiple entries in the Tag Browser match any or all of them"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:787
 msgid "Manage &user categories"
 msgstr "Administrer &brukerkategorier"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:790
+msgid "Add your own categories to the Tag Browser"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182
 msgid "Convert book %d of %d (%s)"
@@ -8346,15 +8562,15 @@ msgstr "Kø bøker for samlet konvertering"
 msgid "Queueing "
 msgstr "Kø "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:239
 msgid "Fetch news from "
 msgstr "Skaff nyheter fra "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:301
 msgid "Convert existing"
 msgstr "Konverter eksisterende"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:302
 msgid ""
 "The following books have already been converted to %s format. Do you wish to "
 "reconvert them?"
@@ -8370,54 +8586,46 @@ msgstr "&Gjenopprett"
 msgid "&Donate to support calibre"
 msgstr "&Doner for å støtte Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:168
 msgid "&Eject connected device"
 msgstr "&Avslutt tilkoblet enhet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:173
 msgid "&Restart"
 msgstr "&Omstart"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:206
-msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
-msgstr "<p>For hjelp, se: <a href=\"%s\">Brukermanual</a><br>"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:212
-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/ui.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:227
 msgid "Calibre Quick Start Guide"
 msgstr "Calibre hurtigstart-guide"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:389
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:380
 msgid "Cannot configure"
 msgstr "Kan ikke konfigurere"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:376
 msgid "Cannot configure while there are running jobs."
 msgstr "Kan ikke konfigurere samtidig som en oppgave kjører."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:381
 msgid "Cannot configure before calibre is restarted."
 msgstr "Kan ikke konfigurere før calibre har blitt startet på nytt."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:424
 msgid "No detailed info available"
 msgstr "Ingen detaljert informasjon er tilgjengelig"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:425
 msgid "No detailed information is available for books on the device."
 msgstr ""
 "Ingen detaljert informasjon er tilgjengelig for bøker på denne enheten."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:486
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr "Feil ved konverteringen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:487
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:478
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using third party tools."
@@ -8426,27 +8634,26 @@ msgstr ""
 "Du må først fjerne DRM beskyttelsen ved å benytte et 3.parts program med "
 "slike egenskaper."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:491
 msgid "Recipe Disabled"
 msgstr "Beskrivelse Slettet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:506
 msgid "<b>Failed</b>"
 msgstr "<b>Feilet</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:546
 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."
+"you find it useful, please consider donating to support its development. "
+"Your donation helps keep calibre development going."
 msgstr ""
-"er resultatet av innsatsen til mange frivillige fra hele verden. Dersom du "
-"synes programmet er godt, vennligst bidra med støtte til videre utvikling."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:572
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr "Det finnes aktive oppgaver. Er du sikker på at du ønsker å avslutte?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:575
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
@@ -8456,11 +8663,11 @@ msgstr ""
 "                      Å avslutte kan føre til feil på enheten.<br>\n"
 "                      Er du sikker på at du ønsker å avslutte?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:579
 msgid "WARNING: Active jobs"
 msgstr "ADVARSEL: Aktive oppgaver"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:640
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:632
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -8468,19 +8675,11 @@ msgstr ""
 "vil fortsette å kjøre i systemstatusfeltet. For å stenge programmet, velg "
 "<b>Stopp</b>  innholdslisten i systemstatusfeltet."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/update.py:52
-msgid ""
-"<span style=\"color:red; font-weight:bold\">Latest version: <a "
-"href=\"%s\">%s</a></span>"
-msgstr ""
-"<span style=\"color:red; font-weight:bold\">Siste versjon: <a "
-"href=\"%s\">%s</a></span>"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/update.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:56
 msgid "Update available"
 msgstr "Oppdatering tilgjengelig"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/update.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:57
 msgid ""
 "%s has been updated to version %s. See the <a href=\"http://calibre-"
 "ebook.com/whats-new\">new features</a>. Visit the download page?"
@@ -8959,105 +9158,43 @@ msgstr "Shift+F3"
 msgid "Print eBook"
 msgstr "Skriv ut e-bok"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
 msgid "Copy Image"
 msgstr "Kopier bilde"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:240
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:239
 msgid "Paste Image"
 msgstr "Lim inn bilde"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:270
-msgid ""
-"Library\n"
-"%d\n"
-"books"
-msgstr ""
-"Bibliotek\n"
-"%d\n"
-"bøker"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:271
-msgid ""
-"Reader\n"
-"%s\n"
-"available"
-msgstr ""
-"Leser\n"
-"%s\n"
-"tilgjengelig"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:272
-msgid ""
-"Card A\n"
-"%s\n"
-"available"
-msgstr ""
-"Kort A\n"
-"%s\n"
-"tilgjengelig"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:273
-msgid ""
-"Card B\n"
-"%s\n"
-"available"
-msgstr ""
-"Kort B\n"
-"%s\n"
-"tilgjengelig"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:277
-msgid "Click to see the books available on your computer"
-msgstr "Klikk for å se hvilke bøker som er tilgjengelige på datamaskinen din"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:280
-msgid "Click to see the books in the main memory of your reader"
-msgstr "Klikk for å se bøker som ligger i hovedminnet til lesplaten din"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:281
-msgid "Click to see the books on storage card A in your reader"
-msgstr ""
-"Klikk for å se bøker som er lagret til lagringskort A på leseplaten din"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:282
-msgid "Click to see the books on storage card B in your reader"
-msgstr ""
-"Klikk for å se bøker som er lagret til lagringskort B på leseplaten din"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:290
-msgid "Books located at"
-msgstr "Bøker lokalisert ved"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:364
 msgid "Change Case"
 msgstr "Endre mellom store og små bokstaver"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:365
 msgid "Upper Case"
 msgstr "Store bokstaver"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:366
 msgid "Lower Case"
 msgstr "Små bokstaver"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:367
 msgid "Swap Case"
 msgstr "Bytt mellom store og små bokstaver"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:368
 msgid "Title Case"
 msgstr "Store eller små bokstaver i tittelen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:974
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:837
 msgid "Drag to resize"
 msgstr "Dra for å endre størrelse"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:869
 msgid "Show"
 msgstr "Vis"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1012
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:876
 msgid "Hide"
 msgstr "Skjul"
 
@@ -10403,9 +10540,8 @@ msgid "User-created tag browser categories"
 msgstr "Brukerdefinerte kategorier for emneordsøk"
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:702
-msgid "Preserve all collections even if not in library metadata."
+msgid "How and when calibre updates metadata on the device."
 msgstr ""
-"Behold alle samlinger selv om de ikke finnes i bibliotekets metadata."
 
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:43
 msgid "Waiting..."
@@ -10577,83 +10713,83 @@ msgstr "Ukjent nyhetskilde"
 msgid "The \"%s\" recipe needs a username and password."
 msgstr "\"%s\"kvitteringen trenger et brukernavn og et pasord."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:706
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:708
 msgid "Download finished"
 msgstr "Nedlasting ferdig"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:708
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:710
 msgid "Failed to download the following articles:"
 msgstr "Klarte ikke å laste ned følgende artikler:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:714
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:716
 msgid "Failed to download parts of the following articles:"
 msgstr "Kunne ikke laste ned deler av den følgende artikklene"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:716
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:718
 msgid " from "
 msgstr " fra "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:718
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:720
 msgid "\tFailed links:"
 msgstr "\tUgyldige lenker:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:807
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:809
 msgid "Could not fetch article. Run with -vv to see the reason"
 msgstr "Kunne ikke hente artikkel. Kjør med -vv for å finne årsaken"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:828
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:830
 msgid "Fetching feeds..."
 msgstr "Henter matinger..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:833
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:835
 msgid "Got feeds from index page"
 msgstr "Funnet matinger fra indeksside"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:839
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:841
 msgid "Trying to download cover..."
 msgstr "Forsøker å laste ned omslag..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:841
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Generating masthead..."
 msgstr "Genererer mastetopp..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:922
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:924
 msgid "Starting download [%d thread(s)]..."
 msgstr "Starter nedlasting [%d thread(s)]..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:938
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:940
 msgid "Feeds downloaded to %s"
 msgstr "Matinger er lastet ned til %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:948
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:950
 msgid "Could not download cover: %s"
 msgstr "Kunne ikke laste ned omslag: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:960
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
 msgid "Downloading cover from %s"
 msgstr "Laster ned omslag fra %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1002
 msgid "Masthead image downloaded"
 msgstr "Mastetopp-bilde er lastet ned"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1190
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1192
 msgid "Untitled Article"
 msgstr "Utittelert artikkel"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1261
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1263
 msgid "Article downloaded: %s"
 msgstr "Artikkelen har blitt lastet ned: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1272
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1274
 msgid "Article download failed: %s"
 msgstr "Artikkelen kunne ikke lastes ned: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1289
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1291
 msgid "Fetching feed"
 msgstr "Henter mating"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1436
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1438
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
@@ -10661,7 +10797,7 @@ msgstr ""
 "Kunne ikke logge inn. Sjekk at du benytter riktig brukernavn og passord for "
 "calibres periodiske service."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1452
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1454
 msgid ""
 "You do not have permission to download this issue. Either your subscription "
 "has expired or you have exceeded the maximum allowed downloads for today."
@@ -11468,9 +11604,26 @@ msgstr "Ikke last ned CSS stilsett"
 #~ "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">new features</a>. "
 #~ "Besøke nedlastingssiden?"
 
+#~ msgid ""
+#~ "<span style=\"color:red; font-weight:bold\">Latest version: <a "
+#~ "href=\"%s\">%s</a></span>"
+#~ msgstr ""
+#~ "<span style=\"color:red; font-weight:bold\">Siste versjon: <a "
+#~ "href=\"%s\">%s</a></span>"
+
+#~ 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 ""
+#~ "er resultatet av innsatsen til mange frivillige fra hele verden. Dersom du "
+#~ "synes programmet er godt, vennligst bidra med støtte til videre utvikling."
+
 #~ msgid "Sort by &popularity"
 #~ msgstr "Sorter etter &populæritet"
 
+#~ msgid "Convert E-books"
+#~ msgstr "Konverter e-bøker"
+
 #~ msgid "Click to turn off Cover Browsing"
 #~ msgstr "Klikk for å slå av omslagsgjennomsyn"
 
@@ -11493,6 +11646,42 @@ msgstr "Ikke last ned CSS stilsett"
 #~ msgid "Ebook Viewer"
 #~ msgstr "E-bokleser"
 
+#~ msgid ""
+#~ "Card A\n"
+#~ "%s\n"
+#~ "available"
+#~ msgstr ""
+#~ "Kort A\n"
+#~ "%s\n"
+#~ "tilgjengelig"
+
+#~ msgid ""
+#~ "Card B\n"
+#~ "%s\n"
+#~ "available"
+#~ msgstr ""
+#~ "Kort B\n"
+#~ "%s\n"
+#~ "tilgjengelig"
+
+#~ msgid ""
+#~ "Reader\n"
+#~ "%s\n"
+#~ "available"
+#~ msgstr ""
+#~ "Leser\n"
+#~ "%s\n"
+#~ "tilgjengelig"
+
+#~ msgid ""
+#~ "Library\n"
+#~ "%d\n"
+#~ "books"
+#~ msgstr ""
+#~ "Bibliotek\n"
+#~ "%d\n"
+#~ "bøker"
+
 #~ msgid ""
 #~ "<h2>Demo videos</h2>Videos demonstrating the various features of calibre are "
 #~ "available <a "
@@ -11551,6 +11740,9 @@ msgstr "Ikke last ned CSS stilsett"
 #~ msgid "Chinese"
 #~ msgstr "kinesisk"
 
+#~ 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>"
+
 #~ msgid "Add a tab at the beginning of each paragraph."
 #~ msgstr "Legg til en tabulatoravstand ved begynnelsen av hvert avsnitt."
 
@@ -11690,6 +11882,9 @@ msgstr "Ikke last ned CSS stilsett"
 #~ msgid "This profile is intended for the Hanlin V3/V5 and its clones."
 #~ msgstr "Denne profilen er ment for Hanlin V3/V5 og dens kloner."
 
+#~ msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
+#~ msgstr "<p>For hjelp, se: <a href=\"%s\">Brukermanual</a><br>"
+
 #~ msgid "Communicate with the Sony PRS-300/505/500 eBook reader."
 #~ msgstr "Kommuniser med Sony PRS-300/505/500 eBook leser"
 
@@ -11796,3 +11991,26 @@ msgstr "Ikke last ned CSS stilsett"
 
 #~ msgid "Connect to iTunes (EXPERIMENTAL)"
 #~ msgstr "Knytt til iTunes (EKSPERIMENTELT)"
+
+#~ msgid "Preserve device collections."
+#~ msgstr "Behold enhetssamlinger."
+
+#~ msgid ""
+#~ "If checked, collections will not be deleted even if a book with changed "
+#~ "metadata is resent and the collection is not in the book's metadata. In "
+#~ "addition, editing collections in the device view will be enabled. If "
+#~ "unchecked, collections will be always reflect only the metadata in the "
+#~ "calibre library."
+#~ msgstr ""
+#~ "Om merket av, vil samlinger ikke bli slettet, selv om en bok med endrede "
+#~ "metadata er sent på nytt og samlingen ikke finnes i bokens metadata. I "
+#~ "tillegg vil endring av samlingen i enhetens leser bli slått på. Om ikke "
+#~ "merket av, vil samlingen bare reflektere metadata som finnes i calibre-"
+#~ "biblioteket."
+
+#~ msgid "  "
+#~ msgstr "  "
+
+#~ msgid "Preserve all collections even if not in library metadata."
+#~ msgstr ""
+#~ "Behold alle samlinger selv om de ikke finnes i bibliotekets metadata."
diff --git a/src/calibre/translations/nl.po b/src/calibre/translations/nl.po
index 43db49b2f2..ccde0c8f4f 100644
--- a/src/calibre/translations/nl.po
+++ b/src/calibre/translations/nl.po
@@ -7,17 +7,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-07-03 01:21+0000\n"
-"PO-Revision-Date: 2010-07-07 21:33+0000\n"
-"Last-Translator: Bart Bone <Unknown>\n"
+"POT-Creation-Date: 2010-07-10 16:12+0000\n"
+"PO-Revision-Date: 2010-07-14 16:39+0000\n"
+"Last-Translator: Koen Mercken <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: 2010-07-08 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-07-15 03:34+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:362
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:365
 msgid "Set metadata from %s files"
 msgstr "Stel metagegevens van %s bestanden in"
 
@@ -31,10 +31,10 @@ msgstr "Doet helemaal niets"
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:71
 #: /home/kovid/work/calibre/src/calibre/devices/prs500/books.py:267
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:466
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:396
-#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:98
-#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:101
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:492
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:398
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:97
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:100
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/metadata.py:56
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:428
 #: /home/kovid/work/calibre/src/calibre/ebooks/fb2/input.py:67
@@ -76,9 +76,9 @@ msgstr "Doet helemaal niets"
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:818
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:49
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:51
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:910
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:915
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:981
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:911
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:916
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:982
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:137
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:139
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:108
@@ -106,20 +106,20 @@ msgstr "Doet helemaal niets"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:233
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:290
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:815
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:818
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:814
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:817
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:172
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:179
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:22
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:135
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:903
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:912
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1192
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1195
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:899
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:908
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1191
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1194
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:120
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:155
@@ -127,8 +127,8 @@ msgstr "Doet helemaal niets"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:172
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:362
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:877
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1054
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:882
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1060
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:87
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:92
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:185
@@ -174,7 +174,7 @@ msgstr "Metagegevens schrijver"
 msgid "Catalog generator"
 msgstr "Catalogus generator"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:15
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:16
 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 "
@@ -184,7 +184,7 @@ msgstr ""
 "gelinkte bestanden. Deze plug-in wordt elke keer wanneer u een HTML-bestand "
 "aan de bibliotheek toevoegt uitgevoerd."
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:51
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:52
 msgid ""
 "Character encoding for the input HTML files. Common choices include: cp1252, "
 "latin1, iso-8859-1 and utf-8."
@@ -192,7 +192,7 @@ msgstr ""
 "Karaktercodering voor de invoer HTML-bestanden. Standaard keuzes zijn: "
 "cp1252, latin1, iso-8859-1 en utf-8."
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:58
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:59
 msgid ""
 "Create a PMLZ archive containing the PML file and all images in the "
 "directory pmlname_img or images. This plugin is run every time you add a PML "
@@ -202,45 +202,45 @@ msgstr ""
 "of images bevat. Deze plug-in wordt steeds uitgevoerd als een PML-bestand "
 "aan de bibliotheek wordt toegevoegd."
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:90
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:93
 msgid "Extract cover from comic files"
 msgstr "Haal de omslag uit bestanden met stripverhalen"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:117
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:128
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:140
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:150
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:160
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:171
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:181
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:191
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:201
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:211
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:221
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:232
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:243
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:255
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:276
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:287
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:297
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:307
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:120
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:131
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:153
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:163
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:174
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:184
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:194
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:204
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:214
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:224
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:235
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:246
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:258
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:279
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:290
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:300
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:310
 msgid "Read metadata from %s files"
 msgstr "Lees de Metagegevens uit %s bestanden"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:266
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:269
 msgid "Read metadata from ebooks in RAR archives"
 msgstr "Lees de metagegevens van ebooks in RAR archieven"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:318
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:321
 msgid "Read metadata from ebooks in ZIP archives"
 msgstr "Lees metagegevens van eboeken in ZIP-archieven"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:331
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:341
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:351
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:373
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:384
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:394
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:334
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:344
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:354
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:376
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:387
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:397
 msgid "Set metadata in %s files"
 msgstr "Stel metagegevens van %s bestanden in"
 
@@ -399,35 +399,35 @@ msgstr ""
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr "Dit profiel is bedoeld voor de Amazon Kindle DX."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:31
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
 msgid "Installed plugins"
 msgstr "Geïnstalleerde Plug-ins"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:33
 msgid "Mapping for filetype plugins"
 msgstr "Binding voor bestandstype plug-ins"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:33
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:34
 msgid "Local plugin customization"
 msgstr "Lokale plug-in aanpassing"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:34
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
 msgid "Disabled plugins"
 msgstr "Uitgeschakelde plugins"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
 msgid "Enabled plugins"
 msgstr "Ingeschakelde plug-ins"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:83
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:84
 msgid "No valid plugin found in "
 msgstr "Geen geldige plugin gevonden in "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:460
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:468
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr "Initialisatie van de plugin %s is mislukt met een traceback:"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:493
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
 msgid ""
 "    %prog options\n"
 "\n"
@@ -439,19 +439,19 @@ msgstr ""
 "    Pas calibre aan door externe plug-ins te laden.\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:499
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr ""
 "Voeg een plug-in toe door het pad op te geven naar het zip-bestand waarin "
 "deze zich bevindt."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 "Verwijder een aangepaste plug-in op naam. Heeft geen effect op ingebouwde "
 "plug-ins"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:503
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:511
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
@@ -459,15 +459,15 @@ msgstr ""
 "Personaliseer plugin. Geef een naam van een plugin en personalisatie string "
 "gescheiden met een komma."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:505
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:513
 msgid "List all installed plugins"
 msgstr "Toon geïnstalleerde plugins"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Enable the named plugin"
 msgstr "Activeer de genoemde plugin"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Disable the named plugin"
 msgstr "Deactiveer de genoemde plugin"
 
@@ -625,11 +625,13 @@ msgstr "Communiceer met Hanlin V5 eBoek lezers."
 msgid "Communicate with the BOOX eBook reader."
 msgstr "Communiceer met de BOOX eBoek lezer."
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:121
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:123
 msgid ""
 "Comma separated list of directories to send e-books to on the device. The "
 "first one that exists will be used."
 msgstr ""
+"Door komma's gescheiden lijst van mappen om e-books naar het apparaat te "
+"sturen. De eerste map die bestaat zal worden gebruikt."
 
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:18
 msgid "Communicate with the Hanvon N520 eBook reader."
@@ -696,34 +698,34 @@ msgstr "Communiceer met de Kobo Reader"
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:51
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:54
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:57
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:157
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:159
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:64
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:67
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:70
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:130
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:137
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:160
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:139
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:162
 msgid "Getting list of books on device..."
 msgstr "Bezig met het ophalen van boeken van het apparaat..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:218
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:258
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:244
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:262
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:219
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:263
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:246
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:264
 msgid "Removing books from device..."
 msgstr "Bezig om boeken te verwijderen van apparaat..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:262
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:269
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:269
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:274
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:267
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:274
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:271
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:276
 msgid "Removing books from device metadata listing..."
 msgstr "Verwijderen boeken van apparaat metagegevens lijst..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:274
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:308
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:208
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:238
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:313
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:210
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:240
 msgid "Adding books to device metadata listing..."
 msgstr "Toevoegen boeken aan apparaat metagegevens lijst..."
 
@@ -739,6 +741,10 @@ msgstr "Verbinden met de Booq Avant"
 msgid "Communicate with the Sweex MM300"
 msgstr "Communiceer met de Sweex MM300"
 
+#: /home/kovid/work/calibre/src/calibre/devices/misc.py:75
+msgid "Communicate with the Pandigital Novel"
+msgstr "Communiceer met de Pandigital Novel."
+
 #: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:17
 msgid "Communicate with the Nokia 770 internet tablet."
 msgstr "Communiceer met Nokia 770 internet tablet."
@@ -888,12 +894,12 @@ msgstr "Communiceer met een e-boek lezer."
 msgid "Get device information..."
 msgstr "Haal lezer informatie op..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:188
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:192
 msgid "Transferring books to device..."
 msgstr "Bezig om de boeken naar het aparaat over te zetten..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:305
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:307
 msgid "Sending metadata to device..."
 msgstr "Versturen van metagegevens naar apparaat..."
 
@@ -1673,6 +1679,57 @@ msgstr "Transformaties worden toegepast op eboek..."
 msgid "Creating"
 msgstr "Aanmaken"
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/__init__.py:18
+msgid "ePub Fixer"
+msgstr "ePub correctie"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/epubcheck.py:18
+msgid "Workaround epubcheck bugs"
+msgstr "lapmiddel epubcheck fouten"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/epubcheck.py:22
+msgid ""
+"Workarounds for bugs in the latest release of epubcheck. epubcheck reports "
+"many things as errors that are not actually errors. epub-fix will try to "
+"detect these and replace them with constructs that epubcheck likes. This may "
+"cause significant changes to your epub, complain to the epubcheck project."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:19
+msgid ""
+"%prog [options] file.epub\n"
+"\n"
+"Fix common problems in EPUB files that can cause them to be rejected by "
+"poorly designed publishing services.\n"
+"\n"
+"By default, no fixing is done and messages are printed out for each error "
+"detected. Use the options to control which errors are automatically fixed."
+msgstr ""
+"%prog [options] file.epu\n"
+"Hersteld eenvoudige problemen in EPUB bestanden die ervoor kunnen zorgen dat "
+"ze geweigerd worden door slecht ontworpen publicatie diensten.\n"
+"De standaard instelling is dat er geen herstellingen gebeuren en dat er "
+"foutmeldingen worden weergegeven voor iedere gevonden fout. Gebruik de "
+"opties om in te stellen welke fouten automatisch hersteld worden."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:50
+msgid "You must specify an epub file"
+msgstr "U dient een epub bestand te specifieren."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:17
+msgid "Fix unmanifested files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:21
+msgid ""
+"Fix unmanifested files. epub-fix can either add them to the manifest or "
+"delete them as specified by the delete unmanifested option."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:32
+msgid "Delete unmanifested files instead of adding them to the manifest"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:56
 msgid ""
 "Extract the contents of the generated EPUB file to the specified directory. "
@@ -2044,11 +2101,11 @@ msgstr "Stripverhaal"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:98
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:882
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:887
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:543
 msgid "Title"
 msgstr "Titel"
@@ -2057,7 +2114,7 @@ msgstr "Titel"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:364
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:883
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:888
 msgid "Author(s)"
 msgstr "Auteur(s)"
 
@@ -2080,7 +2137,7 @@ msgstr "Producent"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:67
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:318
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1073
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1079
 msgid "Comments"
 msgstr "Opmerkingen"
 
@@ -2089,7 +2146,7 @@ msgstr "Opmerkingen"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:306
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1069
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1075
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:139
 msgid "Tags"
 msgstr "Labels"
@@ -2099,7 +2156,7 @@ msgstr "Labels"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:323
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1084
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:87
 msgid "Series"
 msgstr "Serie"
@@ -2109,7 +2166,7 @@ msgid "Language"
 msgstr "Taal"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:406
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1067
 msgid "Timestamp"
 msgstr "Tijdsaanduiding"
 
@@ -2382,7 +2439,7 @@ msgstr ""
 "voor het boek aangeduid met ISBN van LibraryThing.com\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1226
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1398
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1399
 msgid "Cover"
 msgstr "Omslag"
 
@@ -2425,70 +2482,70 @@ msgstr "Alle artikelen"
 msgid "This is an Amazon Topaz book. It cannot be processed."
 msgstr "Dit is een Amazon Topaz boek. Het kan niet worden verwerkt."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1399
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1400
 msgid "Title Page"
 msgstr "Titelpagina"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1400
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1401
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:15
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:53
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:194
 msgid "Table of Contents"
 msgstr "Inhoudsopgave"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1401
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1402
 msgid "Index"
 msgstr "Index"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1402
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1403
 msgid "Glossary"
 msgstr "Verklarende woordenlijst"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1403
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1404
 msgid "Acknowledgements"
 msgstr "Erkenning"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1404
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1405
 msgid "Bibliography"
 msgstr "Bibliografie"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1405
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1406
 msgid "Colophon"
 msgstr "Colofon"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1406
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1407
 msgid "Copyright"
 msgstr "Auteursrecht"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1407
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1408
 msgid "Dedication"
 msgstr "Opgedragen aan"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1408
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1409
 msgid "Epigraph"
 msgstr "Epigraaf"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1409
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1410
 msgid "Foreword"
 msgstr "Voorwoord"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1410
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1411
 msgid "List of Illustrations"
 msgstr "Lijst met afbeeldingen"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1411
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1412
 msgid "List of Tables"
 msgstr "Lijst met tabellen"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1412
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1413
 msgid "Notes"
 msgstr "Aantekeningen"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1413
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1414
 msgid "Preface"
 msgstr "Voorwoord"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1414
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1415
 msgid "Main Text"
 msgstr "Hoofd Tekst"
 
@@ -2535,7 +2592,7 @@ msgstr "Zijpaneel"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:22
 #: /home/kovid/work/calibre/src/calibre/ebooks/tcr/input.py:23
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:23
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:24
 msgid ""
 "Normally calibre treats blank lines as paragraph markers. With this option "
 "it will assume that every line represents a paragraph instead."
@@ -2545,7 +2602,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:26
 #: /home/kovid/work/calibre/src/calibre/ebooks/tcr/input.py:27
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:27
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:28
 msgid ""
 "Normally calibre treats blank lines as paragraph markers. With this option "
 "it will assume that every line starting with an indent (either a tab or 2+ "
@@ -2710,7 +2767,7 @@ msgstr ""
 "Informatie over een PDF bestand.\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
 msgid "Author"
 msgstr "Auteur"
@@ -2887,7 +2944,7 @@ msgstr ""
 "1 is de minste compressie maar het snelst, 10 de hoogste compressie maar het "
 "langzaamst."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:33
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:34
 msgid ""
 "Normally extra spaces are condensed into a single space. With this option "
 "all spaces will be displayed."
@@ -2895,7 +2952,7 @@ msgstr ""
 "Normaal worden alle spaties door een enkele spatie vervangen. Met deze optie "
 "zullen alle spaties zichtbaar gemaakt worden."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:36
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:37
 msgid ""
 "Run the text input through the markdown pre-processor. To learn more about "
 "markdown see"
@@ -2903,7 +2960,7 @@ msgstr ""
 "Voer de text invoer door de markdown pre-processor. Om meer over de markdown "
 "te leren, zie"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:39
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:40
 msgid "Do not insert a Table of Contents into the output text."
 msgstr "Voeg geen inhoudsopgave toe aan de uitvoer tekst."
 
@@ -3086,7 +3143,7 @@ msgstr "Kopieer"
 msgid "Copy to Clipboard"
 msgstr "Kopieer naar het Klembord"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:400
 msgid "Choose Files"
 msgstr "Kies bestanden"
 
@@ -3102,13 +3159,13 @@ msgstr ""
 "Annotaties van de gebruiker alleen gegenereerd in de hoofdbibliotheek"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:75
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:612
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:671
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:708
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:729
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:877
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1060
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:670
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:707
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:728
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:876
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:941
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1059
 msgid "No books selected"
 msgstr "Geen boeken geselecteerd"
 
@@ -3149,144 +3206,144 @@ msgstr "Hoeveel lege boeken?"
 msgid "How many empty books should be added?"
 msgstr "Hoeveel lege boeken moeten worden toegevoegd?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:340
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:390
 msgid "Uploading books to device."
 msgstr "Boeken worden geupload naar de lezer."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:350
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:137
 msgid "Books"
 msgstr "Boeken"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
 msgid "EPUB Books"
 msgstr "EPUB Boeken"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
 msgid "LRF Books"
 msgstr "LRF Boeken"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
 msgid "HTML Books"
 msgstr "HTML Boeken"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
 msgid "LIT Books"
 msgstr "LIT Boeken"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
 msgid "MOBI Books"
 msgstr "MOBI Boeken"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
 msgid "Topaz books"
 msgstr "Topaz boeken"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
 msgid "Text books"
 msgstr "Text boeken"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:359
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
 msgid "PDF Books"
 msgstr "PDF Boeken"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:359
 msgid "Comics"
 msgstr "Stripverhalen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:360
 msgid "Archives"
 msgstr "Archief"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:364
 msgid "Supported books"
 msgstr "Ondersteunde boeken"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:399
 msgid "Merged some books"
 msgstr "Enkele boeken zijn samengevoegd"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:401
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:400
 msgid ""
 "Some duplicates were found and merged into the following existing books:"
 msgstr ""
 "Er zijn duplicaten gevonden en samengevoegd met de volgende bestande boeken:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:409
 msgid "Failed to read metadata"
 msgstr "De metagegevens konden niet gelezen worden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:410
 msgid "Failed to read metadata from the following"
 msgstr "Metagegevens konden niet worden gelezen van de volgende"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:434
 msgid "Add to library"
 msgstr "Aan collectie toevoegen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:460
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1229
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:459
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1228
 msgid "No book selected"
 msgstr "Geen boek geselecteerd"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:434
 msgid "No book files found"
 msgstr "Geen boek bestanden gevonden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:456
 msgid "Cannot delete"
 msgstr "Kan niet verwijderen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:469
 msgid "Choose formats to be deleted"
 msgstr "Kies formaten om te verwijderen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:488
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:487
 msgid "Choose formats <b>not</b> to be deleted"
 msgstr "Kies formaten die <b>niet</b> moeten worden verwijderd"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:507
 msgid "Cannot delete books"
 msgstr "Kan boeken niet verwijderen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:509
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:508
 msgid "No device is connected"
 msgstr "Geen apparaat gevonden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:519
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:518
 msgid "Main memory"
 msgstr "|Hoofdgeheugen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:520
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:444
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:519
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:454
 msgid "Storage Card A"
 msgstr "Geheugenkaart A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:521
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:446
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:455
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:447
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:456
 msgid "Storage Card B"
 msgstr "Geheugenkaart B"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:525
 msgid "No books to delete"
 msgstr "Er  zijn geen boeken om te verwijderen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:526
 msgid "None of the selected books are on the device"
 msgstr "Geen van de geselecteerde boeken bevindt zich op het apparaat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:544
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:600
 msgid "Deleting books from device."
 msgstr "Boeken worden verwijderd van de lezer."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:564
 msgid ""
 "The selected books will be <b>permanently deleted</b> and the files removed "
 "from your computer. Are you sure?"
@@ -3294,7 +3351,7 @@ msgstr ""
 "De geselecteerde boeken zullen <b>permanent worden verwijderd</b> en de "
 "bestanden gewist van de computer. Weet je dit zeker?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:585
 msgid ""
 "The selected books will be <b>permanently deleted</b> from your device. Are "
 "you sure?"
@@ -3302,62 +3359,62 @@ msgstr ""
 "De geselecteerde boeken zullen <b>definitief verwijderd</b> worden van uw "
 "apparaat. Weet u het zeker?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:610
 msgid "Cannot download metadata"
 msgstr "Metagegevens konden niet worden gedownload"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:627
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
 msgid "social metadata"
 msgstr "sociale metagegevens (labels, waarderingen, etc)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
 msgid "covers"
 msgstr "Omslag afbeeldingen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
 msgid "metadata"
 msgstr "metagegevens"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:630
 msgid "Downloading %s for %d book(s)"
 msgstr "Downloaden van %s voor %d boek(en)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:654
 msgid "Failed to download some metadata"
 msgstr "Sommige metagegevens konden niet worden gedownload"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:656
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
 msgid "Failed to download metadata for the following:"
 msgstr "Metagegevens konden niet worden gedownload voor de volgende:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:659
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:658
 msgid "Failed to download metadata:"
 msgstr "Metagegevens konden niet worden gedownload:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:660
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:637
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:522
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:949
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:659
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:638
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:951
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
 msgid "Error"
 msgstr "Fout"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:670
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:707
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:669
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:706
 msgid "Cannot edit metadata"
 msgstr "Metagegevens kunnen niet bewerkt worden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:728
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:731
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:727
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:730
 msgid "Cannot merge books"
 msgstr "Kan boeken niet samenvoegen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:732
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:731
 msgid "At least two books must be selected for merging"
 msgstr ""
 "Er moeten tenminste twee boeken worden geselecteerd om samen te voegen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:736
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:735
 msgid ""
 "All book formats and metadata from the selected books will be added to the "
 "<b>first selected book.</b><br><br> The second and subsequently selected "
@@ -3369,7 +3426,7 @@ msgstr ""
 "verder geselecteerde boeken zullen niet verwijderd of veranderd worden. "
 "<br><br> Bevestig dat u hiermee wilt doorgaan."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:747
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:746
 msgid ""
 "All book formats and metadata from the selected books will be merged into "
 "the <b>first selected book</b>.<br><br>After merger the second and "
@@ -3386,7 +3443,7 @@ msgstr ""
 "verder geselecteerde boeken zullen <b>permanent worden verwijderd </b> van "
 "uw computer.<br><br> Weet u zeker dat u hiermee wilt doorgaan?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:759
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:758
 msgid ""
 "You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
 "proceed?"
@@ -3394,45 +3451,45 @@ msgstr ""
 "Je staat op het punt meer dan 5 boeken samen te voegen. Weet je <b>zeker</b> "
 "dat je dat wilt doen?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:876
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:875
 msgid "Cannot save to disk"
 msgstr "Kan niet naar schijf worden opgeslagen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:878
 msgid "Choose destination directory"
 msgstr "Kies een bestemmingsmap"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:912
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:911
 msgid "Error while saving"
 msgstr "Fout tijdens opslaan"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:913
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:912
 msgid "There was an error while saving."
 msgstr "Er is een fout opgetreden tijdens het opslaan."
 
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:919
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:920
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:921
 msgid "Could not save some books"
 msgstr "Sommige boeken konden niet worden opgeslagen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:922
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:921
 msgid "Click the show details button to see which ones."
 msgstr "Klik de 'laat details zien' knop om te zien welke"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
 msgid "No books selected to generate catalog for"
 msgstr "Geen boeken geselecteerd voor catalogus"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:960
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:959
 msgid "Generating %s catalog..."
 msgstr "Genereren %s catalogus"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:965
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:964
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:264
 msgid "No books found"
 msgstr "Geen boeken gevonden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:966
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:965
 msgid ""
 "No books to catalog\n"
 "Check exclude tags"
@@ -3440,49 +3497,49 @@ msgstr ""
 "Geen boeken te catalogiseren\n"
 "Check uitsluitingstags"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:976
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:975
 msgid "Catalog generated."
 msgstr "Catalogus aangemaakt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:979
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:978
 msgid "Export Catalog Directory"
 msgstr "Exporteer Catalogus Folder"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:980
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:979
 msgid "Select destination for %s.%s"
 msgstr "Selecteer uitvoer voor %s.%s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:996
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:995
 msgid "Fetching news from "
 msgstr "Downloading nieuws van "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1009
 msgid " fetched."
 msgstr " opgehaald"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1059
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1058
 msgid "Cannot convert"
 msgstr "Kan niet converteren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1088
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1087
 msgid "Starting conversion of %d book(s)"
 msgstr "Start conversie van %d boek(en)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1265
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1264
 msgid "Cannot view"
 msgstr "Kan niet bekijken"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1209
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
 msgid "Choose the format to view"
 msgstr "Kies het te bekijken formaat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1218
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1217
 msgid "Multiple Books Selected"
 msgstr "Meerdere Boeken Geselecteerd"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1219
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1218
 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 "
@@ -3494,11 +3551,11 @@ msgstr ""
 "je computer. Eenmaal gestart kan dit proces niet worden afgebroken totdat "
 "het klaar is. Wil je verder gaan?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1227
 msgid "Cannot open folder"
 msgstr "Kan folder niet openen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1266
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1265
 msgid "%s has no available formats."
 msgstr "%s heeft geen beschikbare formaten"
 
@@ -3523,7 +3580,7 @@ msgid "The specified directory could not be processed."
 msgstr "De geselecteerde folder kan niet worden bewerkt."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:845
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr "Geen boeken"
 
@@ -3662,15 +3719,15 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:52
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:633
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:637
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:366
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:371
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:385
@@ -3694,12 +3751,12 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:259
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:265
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:186
@@ -3732,8 +3789,9 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:313
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1059
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1065
 msgid "Path"
 msgstr "Pad"
 
@@ -3750,8 +3808,8 @@ msgid "Formats"
 msgstr "Formaten"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:25
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:886
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1062
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:891
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1068
 msgid "Collections"
 msgstr "Collecties"
 
@@ -3764,12 +3822,12 @@ msgstr "Klik om te openen"
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:305
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:311
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:317
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1068
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1072
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1074
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:458
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:274
 msgid "None"
 msgstr "Geen"
 
@@ -4658,12 +4716,12 @@ msgid "Footer regular expression:"
 msgstr "Voetnoot reguliere expressie:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:56
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:76
 msgid "Invalid regular expression"
 msgstr "Ongeldige reguliere expressie"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:77
 msgid "Invalid regular expression: %s"
 msgstr "Ongeldige reguliere expressie: %s"
 
@@ -4884,11 +4942,11 @@ msgstr ""
 "href=\"http://calibre-ebook.com/user_manual/xpath.html\">XPath "
 "Handleiding</a>."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:127
 msgid "Cover browser could not be loaded"
 msgstr "Kan de omslag browser niet laden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:179
 msgid "Browse by covers"
 msgstr "Zoek op omslag afbeelding"
 
@@ -4947,124 +5005,124 @@ msgstr "toe te voegen labels"
 msgid "tags to remove"
 msgstr "te verwijderen labels"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:49
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:135
 msgid "No details available."
 msgstr "Geen details beschikbaar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:155
 msgid "Device no longer connected."
 msgstr "Apparaat niet meer verbonden."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:270
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:271
 msgid "Get device information"
 msgstr "Lees apparaat informatie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:282
 msgid "Get list of books on device"
 msgstr "Lees boeken lijst van apparaat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:292
 msgid "Get annotations from device"
 msgstr "Haal annotaties uit apparaat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:301
 msgid "Send metadata to device"
 msgstr "Verstuur metagegevens naar apparaat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:305
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:306
 msgid "Send collections to device"
 msgstr "Stuur de collectie(s) naar apparaat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:330
 msgid "Upload %d books to device"
 msgstr "Upload %d boeken naar apparaat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:345
 msgid "Delete books from device"
 msgstr "Verwijder boeken van apparaat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:362
 msgid "Download books from device"
 msgstr "Download boeken van apparaat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:372
 msgid "View book on device"
 msgstr "Bekijk book op apparaat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:408
 msgid "Set default send to device action"
 msgstr "Stel standaard stuur naar apparaat actie in"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:413
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:420
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:422
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:425
 msgid "Email to"
 msgstr "Email naar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:425
 msgid " and delete from library"
 msgstr " en verwijder ze uit de bibliotheek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:434
 msgid "Send to main memory"
 msgstr "Stuur naar hoofdgeheugen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:436
 msgid "Send to storage card A"
 msgstr "Zend naar opslag kaart A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:437
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:438
 msgid "Send to storage card B"
 msgstr "Zend naar opslag kaart B"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:442
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:452
 msgid "Main Memory"
 msgstr "Hoofdgeheugen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:469
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:470
 msgid "Send and delete from library"
 msgstr "Verzend en verwijder uit de bibliotheek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:471
 msgid "Send specific format"
 msgstr "Verzend specifiek formaat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:509
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:510
 msgid "Connect to folder"
 msgstr "Verbind met folder"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:516
 msgid "Connect to iTunes"
 msgstr "Verbind met iTunes"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:521
 msgid "Eject device"
 msgstr "Verbreek apparaat verbinding"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:529
 msgid "Fetch annotations (experimental)"
 msgstr "Haal annoties op (experimenteel)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:638
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:639
 msgid "Error communicating with device"
 msgstr "Fout bij communicatie met lezer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:659
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:660
 msgid "Select folder to open as device"
 msgstr "Selecteer de \"als apparaat\" te openen map"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:704
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:705
 msgid "Failed"
 msgstr "Mislukt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:710
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:711
 msgid "Error talking to device"
 msgstr "Fout bij communicatie met lezer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:711
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:712
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -5072,126 +5130,122 @@ 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/device.py:753
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:754
 msgid "Device: "
 msgstr "Apparaat: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:755
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:756
 msgid " detected."
 msgstr " gedetecteerd"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:778
-msgid "Connected "
-msgstr "Verbonden "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:846
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr "Geselecteerd om te versturen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:851
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:847
 msgid "Choose format to send to device"
 msgstr "Kies formaat om naar apparaat te versturen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:860
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:856
 msgid "No device"
 msgstr "Geen apparaat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:857
 msgid "Cannot send: No device is connected"
 msgstr "Kan niet zenden: geen apparaat beschikbaar"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:860
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:868
 msgid "No card"
 msgstr "Geen kaart aanwezig"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:869
 msgid "Cannot send: Device has no storage card"
 msgstr "Kan niet versturen: Apparaat heeft geen opslag kaart"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:910
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:906
 msgid "E-book:"
 msgstr "E-Boek:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:913
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:909
 msgid "Attached, you will find the e-book"
 msgstr "Aangesloten, je zult het e-boek vinden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:910
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:181
 msgid "by"
 msgstr "door"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:915
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:911
 msgid "in the %s format."
 msgstr "in het %s formaat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:928
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:924
 msgid "Sending email to"
 msgstr "Versturen van email naar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:958
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:965
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1057
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1118
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1236
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:954
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:962
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1054
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1235
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:1243
 msgid "No suitable formats"
 msgstr "Geen geschikte formaten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:959
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:955
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 "Auto-converteer de volgende boeken alvorens ze via email te versturen?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:966
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:963
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 "De voilgende boeken konden niet worden ge-emailed omdat geen beschikbare "
 "formaten zijn gevonden:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:984
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:981
 msgid "Failed to email books"
 msgstr "Boeken konden niet worden ge-emailed."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:985
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:982
 msgid "Failed to email the following books:"
 msgstr "De volgende boeken konden niet worden ge-emailed:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:989
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:986
 msgid "Sent by email:"
 msgstr "Verstuurd via email:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1016
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1013
 msgid "News:"
 msgstr "Nieuws:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1017
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1014
 msgid "Attached is the"
 msgstr "Bijgevoegd is de"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1028
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1025
 msgid "Sent news to"
 msgstr "Nieuws verzonden naar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1058
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1237
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1055
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1117
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1236
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 "Auto-converteer de volgende boeken alvorens ze te uploaden naar het appraat?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1087
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1085
 msgid "Sending catalogs to device."
 msgstr "Verstuur catalogus naar apparaat."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1150
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1149
 msgid "Sending news to device."
 msgstr "Versturen van nieuws naar apparaat."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1202
 msgid "Sending books to device."
 msgstr "Boeken worden naar de lezer verzonden."
 
@@ -5248,7 +5302,7 @@ msgid "My Books"
 msgstr "Mijn Boeken"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:69
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:289
 msgid "Generate catalog"
 msgstr "Genereer Catalogus"
 
@@ -5390,11 +5444,11 @@ msgstr "Breed"
 msgid "Narrow"
 msgstr "Smal"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:503
 msgid "System port selected"
 msgstr "Systeempoort geselecteerd"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:503
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:504
 msgid ""
 "The value <b>%d</b> you have chosen for the content server port is a system "
 "port. Your operating system <b>may</b> not allow the server to run on this "
@@ -5405,132 +5459,132 @@ msgstr ""
 "voorkomen dat de server op deze poort draait. Het is veiliger te kiezen voor "
 "een poortnummer groter dan 1024."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:524
 msgid "Failed to install command line tools."
 msgstr "Kan commando regel commandos niet installeren."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:527
 msgid "Command line tools installed"
 msgstr "commando regel tools geinstalleerd"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:528
 msgid "Command line tools installed in"
 msgstr "Commando regel tools geinstalleerd in"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:529
 msgid ""
 "If you move calibre.app, you have to re-install the command line tools."
 msgstr ""
 "Indien je calibre.app verplaats, zullen de commando regel tools opnieuw "
 "moeten worden geinstalleerd."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:580
 msgid "No valid plugin path"
 msgstr "Geen geldig plugin pad"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:581
 msgid "%s is not a valid plugin path"
 msgstr "%s is geen geldig plugin pad"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:584
 msgid "Choose plugin"
 msgstr "Kies plugin"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:596
 msgid "Plugin cannot be disabled"
 msgstr "Plugin kan niet worden uitgeschakeld"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:597
 msgid "The plugin: %s cannot be disabled"
 msgstr "De plugin: %s kan niet worden uitgeschakeld"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:606
 msgid "Plugin not customizable"
 msgstr "Plugin ondersteund geen persoonlijke instellingen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:607
 msgid "Plugin: %s does not need customization"
 msgstr "Plugin %s heeft geen instellingen nodig"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:615
 msgid "Customize"
 msgstr "Aanpassen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:652
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:653
 msgid "Cannot remove builtin plugin"
 msgstr "Ingebouwde plugin kan niet worden verwijderd"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:653
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:654
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 " Kan niet worden verwijderd. Het is een ingebouwde plugin. Probeer de plugin "
 "uit te schakelen."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:684
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:685
 msgid "You must select a column to delete it"
 msgstr "Om een kolom te verwijderen moet u deze eerst selecteren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:690
 msgid "The selected column is not a custom column"
 msgstr "De geselecteerde kolom is geen \"custom\" kolom"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:690
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:691
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
 msgid "Are you sure?"
 msgstr "Weet je het zeker?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:691
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:692
 msgid "Do you really want to delete column %s and all its data?"
 msgstr "Wilt u werkelijk kolom %s en al zijn gegevens verwijderen?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:758
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:759
 msgid "Error log:"
 msgstr "Foutmeldigenlogbestand:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:765
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:766
 msgid "Access log:"
 msgstr "Toeganglog-bestand:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:793
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:794
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:331
 msgid "Failed to start content server"
 msgstr "Content server kon niet worden gestart"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:817
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:818
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:587
 msgid "Select location for books"
 msgstr "Selecteer de locatie voor boeken"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:824
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:825
 msgid "Invalid size"
 msgstr "Ongeldige grootte"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:825
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:826
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr "De grootte %s is ongeldig. Moet in de vorm BreedtexHoogte zijn"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:884
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:889
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:891
 msgid "Invalid database location"
 msgstr "Foutieve database locatie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:885
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:887
 msgid "Invalid database location "
 msgstr "Foutieve database locatie "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:888
 msgid "<br>Must be a directory."
 msgstr "<br>Moet een folder zijn."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:890
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:892
 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/__init__.py:895
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:897
 msgid "Must restart"
 msgstr "Moet herstarten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:896
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:898
 msgid ""
 "The changes you made require that Calibre be restarted. Please restart as "
 "soon as practical."
@@ -5538,19 +5592,19 @@ msgstr ""
 "De door u aangebrachte wijzigingen vereisen dat Calibre opnieuw opgestart "
 "moet worden. Herstart zo spoedig mogelijk."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:930
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:932
 msgid "Checking database integrity"
 msgstr "Verifieren database integriteit"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:950
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:952
 msgid "Failed to check database integrity"
 msgstr "Database integriteit kon niet worden geverifieerd"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:957
 msgid "Some inconsistencies found"
 msgstr "Inconsistente data gevonden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:956
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:958
 msgid ""
 "The following books had formats listed in the database that are not actually "
 "available. The entries for the formats have been removed. You should check "
@@ -5562,11 +5616,11 @@ msgstr ""
 "moeten checken. Dit kan gebeuren als je de bestanden in de folders direct "
 "hebt gemanipuleerd."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:133
 msgid "TabWidget"
 msgstr "TabWidget"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:134
 msgid ""
 "Here you can control how calibre will read metadata from the files you add "
 "to it. calibre can either read metadata from the contents of the file, or "
@@ -5576,11 +5630,11 @@ msgstr ""
 "bestanden. Calibre kan metagegevens uit het bestand lezen, of uit de "
 "bestandsnaam samenstellen."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:135
 msgid "Read metadata only from &file name"
 msgstr "Lees metagegevens alleen uit de &bestandsnaam"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:136
 msgid ""
 "Swap the firstname and lastname of the author. This affects only metadata "
 "read from file names."
@@ -5588,11 +5642,11 @@ msgstr ""
 "Verwissel de voornaam en achternaam van de auteur. Dit heeft alleen "
 "betrekking op metagegevens gelezen uit bestandsnamen."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:137
 msgid "&Swap author firstname and lastname"
 msgstr "&Verwissel auteur voornaam en achternaam"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:138
 msgid ""
 "If an existing book with a similar title and author is found that does not "
 "have the format being added, the format is added\n"
@@ -5603,7 +5657,7 @@ msgid ""
 "punctuation, case, etc. Author match is exact."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:142
 msgid ""
 "If books with similar titles and authors found, &merge the new files "
 "automatically"
@@ -5611,15 +5665,15 @@ msgstr ""
 "Voeg nieuwe bestanden automatisch toe indien boeken met zelfde titel en "
 "auteur worden gevonden."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:143
 msgid "&Configure metadata from file name"
 msgstr "&Configureer metagegevens uit bestandsnaam"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:144
 msgid "&Adding books"
 msgstr "Boeken &Toevoegen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:145
 msgid ""
 "Here you can control how calibre will save your books when you click the "
 "Save to Disk button:"
@@ -5627,60 +5681,79 @@ msgstr ""
 "Hier kun je bepalen hoe calibre je boeken zal bewaren wanneer je de bewaar "
 "op schijf knop aanklikt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:146
 msgid "Save &cover separately"
 msgstr "Bewaar &Omslag apart"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:147
 msgid "Update &metadata in saved copies"
 msgstr "Update &metagegevens in de opgeslagen copieën"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:148
 msgid "Save metadata in &OPF file"
 msgstr "Bewaar metagegevens in &OPF bestand"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:149
 msgid "Convert non-English characters to &English equivalents"
 msgstr "Converteer niet-Engelse tekens naar &Engelse equivalenten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:150
 msgid "Format &dates as:"
 msgstr "Formatteer &datum als:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:151
 msgid "File &formats to save:"
 msgstr "Op te slaan bestands &formaten:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:152
 msgid "Replace space with &underscores"
 msgstr "Vervang spatie met &underscores"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:153
 msgid "Change paths to &lowercase"
 msgstr "Verander pad in &kleine letters"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:154
 msgid "&Saving books"
 msgstr "&Bewaren boeken"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:135
-msgid "Preserve device collections."
-msgstr "Bewaar collecties op het apparaat"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:136
-msgid ""
-"If checked, collections will not be deleted even if a book with changed "
-"metadata is resent and the collection is not in the book's metadata. In "
-"addition, editing collections in the device view will be enabled. If "
-"unchecked, collections will be always reflect only the metadata in the "
-"calibre library."
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:155
+msgid "Metadata &management:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:137
-msgid "  "
-msgstr "  "
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:156
+msgid "Manual management"
+msgstr "Handmatige instellingen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:157
+msgid "Only on send"
+msgstr "Enkel bij het versturen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:158
+msgid "Automatic management"
+msgstr "Automatische instellingen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:159
+msgid ""
+"<li><b>Manual Management</b>: Calibre updates the metadata and adds "
+"collections only when a book is sent. With this option, calibre will never "
+"remove a collection.</li>\n"
+"<li><b>Only on send</b>: Calibre updates metadata and adds/removes "
+"collections for a book only when it is sent to the device. </li>\n"
+"<li><b>Automatic management</b>: Calibre automatically keeps metadata on the "
+"device in sync with the calibre library, on every connect</li></ul>"
+msgstr ""
+"<li><b>Handmatig beleid</b>: Calibre past de metadata aan en voegt "
+"collecties toe enkel op het moment dat er een boek wordt verstuurd. Als deze "
+"optie aan staat zal calibre nooit een collectie verwijderen.</li>\n"
+"<li><b>Enkel verzenden</b>: Calibre past de metadata aan en voegt collecties "
+"toe of verwijderd ze alleen op het moment dat er een boek naar het apparaat "
+"wordt verstuurd.</li>\n"
+"<li><b>Automatisch beleid</b>: Calibre syncroniseert metadata op het "
+"apparaat met de metadata in de calibre bibliotheek bij iedere connectie met "
+"het apparaat.</li></ul>"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:162
 msgid ""
 "Here you can control how calibre will save your books when you click the "
 "Send to Device button. This setting can be overriden for individual devices "
@@ -5691,18 +5764,19 @@ msgstr ""
 "bepaalde apparaten door de apparaat interface plugins in te stellen onder "
 "voorkeuren -> plugins."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:163
 msgid "Sending to &device"
 msgstr "Verstuur naar &apparaat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:167
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:174
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr "Voorkeuren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
@@ -5710,27 +5784,27 @@ msgstr ""
 "&Locatie van de 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/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
 msgid "Browse for the new database location"
 msgstr "Blader naar de nieuwe database locatie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
 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/config_ui.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
 msgid "Download &social metadata (tags/ratings/etc.) by default"
 msgstr "Download &sociale metadata (labels, waarderingen, etc) standaard"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
 msgid "&Overwrite author and title by default when fetching metadata"
 msgstr "&Overschrijf auteur en titel standaard met geladen metadata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
 msgid "Default network &timeout:"
 msgstr "Standaard netwerk &timeout:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
@@ -5738,154 +5812,158 @@ 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/config_ui.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
 msgid " seconds"
 msgstr " seconden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
 msgid "Choose &language (requires restart):"
 msgstr "Kier &taal (herstart nodig)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
 msgid "Normal"
 msgstr "Standaard"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
 msgid "High"
 msgstr "Hoog"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
 msgid "Low"
 msgstr "Laag"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
 msgid "Job &priority:"
 msgstr "werk &prioriteit:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
 msgid "Preferred &output format:"
 msgstr "Voorkeur &uitvoer formaat:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
 msgid "Preferred &input format order:"
 msgstr "Voorkeur &invoer formaat volgorde:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
 msgid "Use &Roman numerals for series number"
 msgstr "Gebruik &Romeinse nummers voor de series"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
 msgid "Enable system &tray icon (needs restart)"
 msgstr "Activeer systeemvak icoon"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
 msgid "Show &notifications in system tray"
 msgstr "Laat &notificaties zien in het systeemvak"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
 msgid "Show &splash screen at startup"
 msgstr "Laat het opstartscherm zien"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr "Beeld omslag &verkenner in een apart scherm (herstart nodig)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
 msgid "Show &average ratings in the tags browser"
 msgstr "L&aat de gemiddelde waarderingen in de catagorieen browser zien"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
 msgid "Search as you type"
 msgstr "Zoek al typend"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr "Zend gedownload &nieuws automatisch naar eboek lezer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
 msgid "&Delete news from library when it is automatically sent to reader"
 msgstr ""
 "&Verwijder nieuws van bibliotheek zodra het automatisch naar de lezer is "
 "verstuurd"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr "&Aantal omslagen zichtbaar in verkenner modus (herstart nodig)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
 msgid "Toolbar"
 msgstr "Werkbalk"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
 msgid "Large"
 msgstr "Groot"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
 msgid "Medium"
 msgstr "Middel"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
 msgid "Small"
 msgstr "Klein"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
 msgid "&Button size in toolbar"
 msgstr "&Knop grootte in werkbalk"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
 msgid "Show &text in toolbar buttons"
 msgstr "Laat &tekst zien in werkbalk knoppen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
 msgid "Select visible &columns in library view"
 msgstr "Selecteer zichtbare &kolommen in bibliotheek weergave"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
 msgid "Remove a user-defined column"
 msgstr "Verwijder een door de gebruiker gedefinieerde kolom"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
 msgid "Add a user-defined column"
 msgstr "Voeg een door de gebruiker gedefinieerde kolom toe"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
 msgid "Edit settings of a user-defined column"
 msgstr "Bewerk een door de gebruiker gedefinieerde kolom"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
 msgid "Use internal &viewer for:"
 msgstr "Gebruik interne &viewer voor:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
 msgid "User Interface &layout (needs restart):"
 msgstr "Gebruikers Interface &layout (heeft een herstart nodig):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 "Blokkeer alle animaties. Bruikbaar als u een langzame/oude computer heeft."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
 msgid "Disable &animations"
 msgstr "Blokkeer &animaties"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
+msgid "Show &donate button (restart)"
+msgstr "Geef &donatieknop weer (herstart)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
 msgid "Add an email address to which to send books"
 msgstr "Voeg een email adres toe om boeken naar toe te sturen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
 msgid "&Add email"
 msgstr "&Voeg email toe"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
 msgid "Make &default"
 msgstr "Maak &standaard"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
 msgid "&Remove email"
 msgstr "Verwijde&r email"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
 msgid ""
 "calibre can send your books to you (or your reader) by email. Emails will be "
 "automatically sent for downloaded news to all email addresses that have Auto-"
@@ -5895,33 +5973,33 @@ msgstr ""
 "automatisch gestuurd voor gedownload nieuws naar alle email adressen "
 "waarvoor automatisch opsturen is aangevinkt."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
 msgid "&Maximum number of waiting worker processes (needs restart):"
 msgstr "&Maximum aantal wachten werk processen (herstart nodig)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
 msgid "&Check database integrity"
 msgstr "&Controleer database integriteit"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
 msgid "&Install command line tools"
 msgstr "Installeer commando regel tools"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
 msgid "Open calibre &configuration directory"
 msgstr "Open calibre &configuratie folder"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
 msgid "Limit the max. simultaneous jobs to the available CPU &cores"
 msgstr ""
 "Limiteer het max. aantal gelijktijdige werk processen aan het aantal "
 "beschikbare processor &cores"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
 msgid "Debug &device detection"
 msgstr "Foutopsporing &apparaat detectie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
 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 "
@@ -5931,25 +6009,25 @@ msgstr ""
 "bekijken in een webbrowser van waar dan ook ter wereld. Wijzigingen in de "
 "instellingen hebben pasd effect na het herstarten van de server."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
 msgid "Server &port:"
 msgstr "Server &poort:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:212
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:117
 msgid "&Username:"
 msgstr "Gebr&uikersnaam:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:213
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:119
 msgid "&Password:"
 msgstr "W&achtwoord:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
@@ -5957,7 +6035,7 @@ msgstr ""
 "Als je het wachtwoord blank laat, dan kan iedereen je boek collectie zien "
 "via de web interface"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
@@ -5965,45 +6043,45 @@ msgstr ""
 "De maximum dimensie (BreedtexHoogte) voor weergegeven omslagen. Grotere "
 "omslagen worden in grootte aangepast. "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
 msgid "Max. &cover size:"
 msgstr "Max. &Omslag grootte:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:621
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:214
 msgid "&Show password"
 msgstr "&Geef wachtwoord weer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
 msgid "Max. &OPDS items per query:"
 msgstr "Max. &OPDS onderdelen per zoekopdracht"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
 msgid "Max. OPDS &ungrouped items:"
 msgstr "Max. OPDS &ongegroepeerde items:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
 msgid "&Start Server"
 msgstr "&Start Server"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:621
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
 msgid "St&op Server"
 msgstr "St&op Server"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:626
 msgid "&Test Server"
 msgstr "&Test Server"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
 msgid "Run server &automatically on startup"
 msgstr "Start server &automatisch tijdens opstarten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:628
 msgid "View &server logs"
 msgstr "Bekijk &server logs"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:46
 msgid ""
 "<p>Remember to leave calibre running as the server only runs as long as "
@@ -6021,7 +6099,7 @@ msgstr ""
 "gequalificeerde hostname of het IP adres van de computer waar calibre op "
 "draait."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:631
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
@@ -6029,27 +6107,27 @@ msgstr ""
 "Hiere kun je het gedrag van calibre instellen door te configureren welke "
 "plugins te gebruiken."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:628
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:632
 msgid "Enable/&Disable plugin"
 msgstr "Activeer/&Deactiveer plugin"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:633
 msgid "&Customize plugin"
 msgstr "&Persoonlijke instellingen plugin"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:630
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:634
 msgid "&Remove plugin"
 msgstr "&Verwijder plugin"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:635
 msgid "Add new plugin"
 msgstr "Voeg nieuwe plugin toe"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:632
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:636
 msgid "Plugin &file:"
 msgstr "Plugin &bestand:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:634
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:638
 msgid "&Add"
 msgstr "&Toevoegen"
 
@@ -6087,9 +6165,9 @@ msgstr "Nummer"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:31
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:884
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:889
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Date"
 msgstr "Datum"
@@ -6108,11 +6186,12 @@ msgstr "Maak en wijzig tag-gebaseerde kolommen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:19
 msgid "Text, column shown in the tag browser"
-msgstr ""
+msgstr "Text, kolom weergegeven in de labelbrowser"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:22
 msgid "Comma separated text, like tags, shown in the tag browser"
 msgstr ""
+"Door comma's gescheiden text, zoals labels, weergeven in de labelbrowser."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:25
 msgid "Long text, like comments, not shown in the tag browser"
@@ -6120,7 +6199,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:28
 msgid "Text column for keeping series-like information"
-msgstr ""
+msgstr "Text kolom voor het bewaren van series informatie"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:33
 msgid "Floating point numbers"
@@ -6206,6 +6285,7 @@ msgstr ""
 msgid ""
 "Column heading in the library view and category name in the tag browser"
 msgstr ""
+"Kolom hoofd in de bibliotheek weergave en categorie naam in de labelbrowser"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column_ui.py:106
 msgid "Column &type"
@@ -6299,12 +6379,20 @@ msgstr "&Laat deze waarschuwing nogmaals zien"
 msgid "ERROR"
 msgstr "FOUT"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:67
+msgid ""
+"All checked books will be <b>permanently deleted</b> from your device. "
+"Please verify the list."
+msgstr ""
+"Alle aangevinkte boeken zullen <b>definitief verwijderd worden</b> van het "
+"apparaat. Gelieve de lijst te verifiëren."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 msgid "Location"
 msgstr "Locatie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1058
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1064
 msgid "Format"
 msgstr "Formaat"
 
@@ -6595,11 +6683,13 @@ msgstr "Dit ISBN nummer is ongeldig"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:521
 msgid "Cannot use tag editor"
-msgstr ""
+msgstr "Het is niet mogelijk om het labelopmaakprogramma te gebruiken"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:522
 msgid "The tags editor cannot be used if you have modified the tags"
 msgstr ""
+"Het labelopmaakprogramma kan niet gebruikt worden als u de labels hebt "
+"gewijzigd"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:542
 msgid "Downloading cover..."
@@ -6755,34 +6845,36 @@ msgstr "Afbreken..."
 msgid ""
 "The current saved search will be <b>permanently deleted</b>. Are you sure?"
 msgstr ""
+"De huidige opgeslagen zoekopdracht wordt <b> permanent verwijderd </ b>. "
+"Weet je het zeker?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:83
 msgid "Saved Search Editor"
-msgstr ""
+msgstr "Opgeslagen Zoekopdrachten Editor"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:84
 msgid "Saved Search: "
-msgstr ""
+msgstr "Opgeslagen Zoekopdracht: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:85
 msgid "Select a saved search to edit"
-msgstr ""
+msgstr "Kies een opgeslagen zoekopdracht om te bewerken"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:86
 msgid "Delete this selected saved search"
-msgstr ""
+msgstr "Verwijder deze geselecteerde opgeslagen zoekopdracht"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:88
 msgid "Enter a new saved search name."
-msgstr ""
+msgstr "Geef een nieuwe opgeslagen zoekopdracht naam."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:89
 msgid "Add the new saved search"
-msgstr ""
+msgstr "Voeg de nieuwe opgeslagen zoekopdracht toe"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:91
 msgid "Change the contents of the saved search"
-msgstr ""
+msgstr "Verander de inhoud van de opgeslagen zoekopdracht"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:119
 msgid "Need username and password"
@@ -7049,60 +7141,64 @@ msgstr "Uitgevers"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:110
 msgid " (not on any book)"
-msgstr ""
+msgstr " (in geen enkel boek)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:162
 msgid ""
 "The current tag category will be <b>permanently deleted</b>. Are you sure?"
 msgstr ""
+"De huidige labelcategorie zal <b>definitief verwijderd worden</b>. Bent u "
+"zeker??"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:153
 msgid "User Categories Editor"
-msgstr ""
+msgstr "Gebruiker categorien opmaakprogramma"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:154
 msgid "A&vailable items"
-msgstr ""
+msgstr "Beschikbare items"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:155
 msgid "Apply tags to current tag category"
-msgstr ""
+msgstr "Pas labels toe op de huidige labelcategorie"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:157
 msgid "A&pplied items"
-msgstr ""
+msgstr "Toegepaste items"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:158
 msgid "Unapply (remove) tag from current tag category"
-msgstr ""
+msgstr "Verwijder het label van de huidige labelcategorie"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:160
 msgid "Category name: "
-msgstr ""
+msgstr "Categorienaam: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:161
 msgid "Select a category to edit"
-msgstr ""
+msgstr "Selecteer een categorie om te wijzigen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:162
 msgid "Delete this selected tag category"
-msgstr ""
+msgstr "Verwijder de geselecteerde labelcategory"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:164
 msgid "Enter a new category name. Select the kind before adding it."
 msgstr ""
+"Geef een nieuwe categorienaam in. Selecteer het type voor dat u de naam "
+"toevoegd."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:165
 msgid "Add the new category"
-msgstr ""
+msgstr "Voeg de nieuwe categorie toe"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:167
 msgid "Category filter: "
-msgstr ""
+msgstr "Categoriefilter: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:168
 msgid "Select the content kind of the new category"
-msgstr ""
+msgstr "Selecteer het type inhoud voor de nieuwe categorie"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:101
@@ -7162,57 +7258,64 @@ msgid "Add tag to available tags and apply it to current book"
 msgstr ""
 "Voeg een label toe aan de beschikbare lijst, evenals aan het huidige boek"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:20
+msgid "%s (was %s)"
+msgstr "%s (was %s)"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:501
 msgid "Item is blank"
-msgstr ""
+msgstr "Veld is leeg"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:71
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:502
 msgid "An item cannot be set to nothing. Delete it instead."
-msgstr ""
+msgstr "Een veld kan niet leeg zijn. U dient het te verwijderen."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:87
 msgid "No item selected"
-msgstr ""
+msgstr "Geen item geselecteerd"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:88
 msgid "You must select one item from the list of Available items."
 msgstr ""
+"U dient één van de items te selecteren uit de lijst van beschikbare items."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:97
 msgid "No items selected"
-msgstr ""
+msgstr "Geen items geselecteerd"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:98
 msgid "You must select at least one items from the list."
-msgstr ""
+msgstr "Je dient minstens één van de items uit de lijst te selecteren."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:102
 msgid "Are you certain you want to delete the following items?"
-msgstr ""
+msgstr "Bent je zeker dat je deze items wilt verwijderen?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:72
 msgid "Category Editor"
-msgstr ""
+msgstr "Categorieën bewerken"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:73
 msgid "Items in use"
-msgstr ""
+msgstr "Items in gebruik"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:74
 msgid ""
 "Delete item from database. This will unapply the item from all books and "
 "then remove it from the database."
 msgstr ""
+"Wis item uit de database. Dit zal het item in alle boeken ongedaan maken en "
+"het uit de database verwijderen."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:76
 msgid "Rename the item in every book where it is used."
-msgstr ""
+msgstr "Hernoem het item in ieder boek waar het mee geassocieerd is."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:78
 msgid "Ctrl+S"
-msgstr ""
+msgstr "Ctrl+S"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:51
 msgid "Test email settings"
@@ -7488,11 +7591,11 @@ msgstr "Reguliere expressie (?P&lt;titel&gt;)"
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:88
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:93
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:98
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:100
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:99
 msgid "No match"
 msgstr "Geen overeenkomst"
 
@@ -7532,43 +7635,43 @@ msgstr "Reguliere expressie (?P<isbn>)"
 msgid "Save single format to disk..."
 msgstr "Bewaar enkel formaat op schijf..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:53
 msgid "Edit metadata individually"
 msgstr "Bewerk metagegevens individueel"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:56
 msgid "Edit metadata in bulk"
-msgstr "Bewerk metagegevens op groepsnivo"
+msgstr "Bewerk metagegevens op groepsniveau"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:59
 msgid "Download metadata and covers"
 msgstr "Download metagegevens en omslag afbeeldingen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:62
 msgid "Download only metadata"
 msgstr "Download alleen metagegevens"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:64
 msgid "Download only covers"
 msgstr "Download alleen omslag afbeeldingen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:67
 msgid "Download only social metadata"
 msgstr "Download alleen sociale metagegevens (labels, waarderingen, etc)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:73
 msgid "Merge into first selected book - delete others"
 msgstr "Samenvoegen met het eerste geselecteerde boek - verwijder de anderen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:76
 msgid "Merge into first selected book - keep others"
 msgstr "Samenvoegen met het eerste geselecteerde boek - behoudt de anderen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:84
 msgid "Add books from a single directory"
 msgstr "Voeg boeken toe uit een enkele folder"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:86
 msgid ""
 "Add books from directories, including sub-directories (One book per "
 "directory, assumes every ebook file is the same book in a different format)"
@@ -7576,7 +7679,7 @@ msgstr ""
 "Voeg boeken toe uit folders, inclusief sub-folders (Een boek per folder, "
 "neemt aan dat ieder eboek bestand hetzelfde boek in een ander formaat bevat)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:90
 msgid ""
 "Add books from directories, including sub directories (Multiple books per "
 "directory, assumes every ebook file is a different book)"
@@ -7584,102 +7687,120 @@ msgstr ""
 "Voeg boeken toe uit folders, inclusief sub-folders (Meerdere boeken per "
 "folder, neemt aan dat ieder eboek bestand een ander boek bevat)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:93
 msgid "Add Empty book. (Book entry with no formats)"
 msgstr "Voeg leeg boek toe (Boek zonder formaten)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:102
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:160
 msgid "Save to disk"
 msgstr "Opslaan op schijf"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Save to disk in a single directory"
 msgstr "Opslaan op schijf in een enkele folder"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:106
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:402
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:393
 msgid "Save only %s format to disk"
 msgstr "Bewaar alleen %s formaat op schijf"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:110
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:396
 msgid "Save only %s format to disk in a single directory"
-msgstr ""
+msgstr "Bewaar enkel %s formaat op de harde schijf, in één enkele map"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:119
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:166
 msgid "View"
 msgstr "Bekijk"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:121
 msgid "View specific format"
 msgstr "Bekijk specifiek formaat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:127
 msgid "Remove selected books"
 msgstr "Verwijder geselecteerde boeken"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:129
 msgid "Remove files of a specific format from selected books.."
 msgstr ""
 "Verwijder bestanden in een specifiek formaat van de geselecteerde boeken.."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:132
 msgid "Remove all formats from selected books, except..."
 msgstr "Verwijder alle formaten van de geselecterde boeken, behalve..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:135
 msgid "Remove covers from selected books"
 msgstr "Verwijder omslagen van de geselecteerde boeken"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:138
 msgid "Remove matching books from device"
-msgstr ""
+msgstr "Verwijder de boeken die aan de criteria voldoen van het apparaat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:155
 msgid "Convert individually"
 msgstr "Converteer Individueel"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:157
 msgid "Bulk convert"
 msgstr "Converteer Groep"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:161
 msgid "Create catalog of books in your calibre library"
 msgstr "Maak catalogus van boeken in je calibre bibliotheek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:169
 msgid "Run welcome wizard"
 msgstr "Start de welkom wizard"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:191
 msgid "Similar books..."
 msgstr "Vergelijkbare boeken"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:223
 msgid "Add books to library"
-msgstr ""
+msgstr "Voeg boeken toe aan de bibliotheek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:234
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:241
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:239
 msgid "Manage collections"
-msgstr ""
+msgstr "Bewerk collecties"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:328
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:319
 msgid "Cover Browser"
-msgstr ""
+msgstr "Omslagbrowser"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:337
 msgid "Tag Browser"
+msgstr "Labelbrowser"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:358
+msgid "version"
+msgstr "versie"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:359
+msgid "created by Kovid Goyal"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:403
-msgid "Book Details"
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:377
+msgid "Connected "
+msgstr "Verbonden "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:386
+msgid "Update found"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:430
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:439
+msgid "Book Details"
+msgstr "Details van het boek"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:60
 msgid "Job"
 msgstr "Opdracht"
@@ -7740,13 +7861,227 @@ msgstr "Klik om een lijst met actieve opdrachten te zien"
 msgid " - Jobs"
 msgstr " - Taken"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:64
+msgid ""
+"Library\n"
+"%d books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:65
+msgid ""
+"Reader\n"
+"%s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:66
+msgid ""
+"Card A\n"
+"%s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:67
+msgid ""
+"Card B\n"
+"%s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:71
+msgid "Click to see the books available on your computer"
+msgstr "Klik hier om de boeken te zien die beschikbaar zijn op uw computer"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:74
+msgid "Click to see the books in the main memory of your reader"
+msgstr "Klik hier om de boeken te zien in het hoofdgeheugen van je lezer"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:75
+msgid "Click to see the books on storage card A in your reader"
+msgstr "Klik hier om de boeken te zien op opslagkaart A in je lezer"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:76
+msgid "Click to see the books on storage card B in your reader"
+msgstr "Klik hier om de boeken te zien op opslagkaart B in je lezer"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:84
+msgid "Books located at"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:100
+msgid "free"
+msgstr "vrij"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:134
+msgid ""
+"Books display will be restricted to those matching the selected saved search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:136
+msgid "Advanced search"
+msgstr "Geavanceerde Zoekopdracht"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:141
+msgid ""
+"<p>Search the list of books by title, author, publisher, tags, comments, "
+"etc.<br><br>Words separated by spaces are ANDed"
+msgstr ""
+"<p>Zoek door de boekenlijst gesorteerd op titek, auteur, uitgever, labels, "
+"commentaar, enz.<br><br>Woorden gescheiden door spaties worden samengevoegd"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:142
+msgid "Reset Quick Search"
+msgstr "Snelzoeken wissen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:328
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:144
+msgid "Copy current search text (instead of search name)"
+msgstr "Kopieer de huidige zoektekst (in plaats van zoeknaam)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:146
+msgid "Save current search under the name shown in the box"
+msgstr "Bewaar de huidige zoekopdracht onder de naam getoond in de box"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:148
+msgid "Delete current saved search"
+msgstr "Verwijder de huidige bewaarde zoekopdracht"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:150
+msgid "Add books"
+msgstr "Voeg boeken toe"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:151
+msgid "A"
+msgstr "A"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:153
+msgid "Remove books"
+msgstr "Verwijder boeken"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:154
+msgid "Del"
+msgstr "Del"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:406
+msgid "Edit meta info"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:406
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:156
+msgid "E"
+msgstr "E"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:157
+msgid "Merge book records"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:158
+msgid "M"
+msgstr "M"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:159
+msgid "Send to device"
+msgstr "Zend naar lezer"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:161
+msgid "S"
+msgstr "S"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:162
+msgid "Fetch news"
+msgstr "Download nieuws"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:163
+msgid "F"
+msgstr "F"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:164
+msgid "Convert books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:165
+msgid "C"
+msgstr "C"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:167
+msgid "V"
+msgstr "V"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:168
+msgid "Open containing folder"
+msgstr "Open betreffende map"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:169
+msgid "Show book details"
+msgstr "Laat boek details zien"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:170
+msgid "Books by same author"
+msgstr "Boeken van dezelfde auteur"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:171
+msgid "Books in this series"
+msgstr "Boeken in deze serie"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:172
+msgid "Books by this publisher"
+msgstr "Boeken van deze uitgever"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:173
+msgid "Books with the same tags"
+msgstr "Boeken met dezelfde labels"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:176
+msgid "Ctrl+P"
+msgstr "Ctrl+P"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:177
+msgid "Help"
+msgstr "Hulp"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:178
+msgid "Browse the calibre User Manual"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:179
+msgid "F1"
+msgstr "F1"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:284
 msgid "N"
-msgstr ""
+msgstr "N"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:284
 msgid "Y"
-msgstr ""
+msgstr "Y"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
 msgid "On Device"
@@ -7761,29 +8096,29 @@ msgid "Rating"
 msgstr "Waardering"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:324
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1084
 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/models.py:674
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1176
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1182
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:886
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:885
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:890
 msgid "Size"
-msgstr ""
+msgstr "Grootte"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1156
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1162
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1165
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr "Dubbel-klik om me te <b>wijzigen</b><br><br>"
 
@@ -7797,11 +8132,11 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:116
 msgid "Ascending"
-msgstr ""
+msgstr "Oplopend"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:119
 msgid "Descending"
-msgstr ""
+msgstr "Aflopend"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:131
 msgid "Change text alignment for %s"
@@ -7809,15 +8144,15 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:133
 msgid "Left"
-msgstr ""
+msgstr "Links"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:133
 msgid "Right"
-msgstr ""
+msgstr "Rechts"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:134
 msgid "Center"
-msgstr ""
+msgstr "Midden"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:153
 msgid "Show column"
@@ -7827,11 +8162,11 @@ msgstr ""
 msgid "Restore default layout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:524
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:525
 msgid "Not allowed"
 msgstr "Niet toegestaan"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:526
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
@@ -7945,7 +8280,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:96
 msgid "Failed to create calibre library at: %r."
-msgstr ""
+msgstr "Mislukken van de creatie van de calibre bibliotheek in: %r."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:184
@@ -8031,157 +8366,34 @@ msgstr "probeer de computer opnieuw op te starten"
 msgid "try deleting the file"
 msgstr "probeer het bestand te verwijderen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:131
 msgid "calibre"
 msgstr "Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:133
 msgid "&Restrict to:"
-msgstr ""
+msgstr "&Beperkt tot:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
-msgid ""
-"Books display will be restricted to those matching the selected saved search"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:135
 msgid "set in ui.py"
 msgstr "gezet in ui.py"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
-msgid "Advanced search"
-msgstr "Geavanceerde Zoekopdracht"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:138
 msgid "Alt+S"
 msgstr "Alt+S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:139
 msgid "&Search:"
 msgstr "&Zoeken:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
-msgid ""
-"<p>Search the list of books by title, author, publisher, tags, comments, "
-"etc.<br><br>Words separated by spaces are ANDed"
-msgstr ""
-"<p>Zoek door de boekenlijst gesorteerd op titek, auteur, uitgever, labels, "
-"commentaar, enz.<br><br>Woorden gescheiden door spaties worden samengevoegd"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
-msgid "Reset Quick Search"
-msgstr "Snelzoeken wissen"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
-msgid "Choose saved search or enter name for new saved search"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
-msgid "Copy current search text (instead of search name)"
-msgstr "Kopieer de huidige zoektekst (in plaats van zoeknaam)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
-msgid "Save current search under the name shown in the box"
-msgstr "Bewaar de huidige zoekopdracht onder de naam getoond in de box"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
-msgid "Delete current saved search"
-msgstr "Verwijder de huidige bewaarde zoekopdracht"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
-msgid "Add books"
-msgstr "Voeg boeken toe"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
-msgid "A"
-msgstr "A"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
-msgid "Remove books"
-msgstr "Verwijder boeken"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
-msgid "Del"
-msgstr "Del"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:155
 msgid "Edit meta information"
 msgstr "Wijzig meta informatie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
-msgid "E"
-msgstr "E"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
-msgid "Merge book records"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
-msgid "M"
-msgstr "M"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
-msgid "Send to device"
-msgstr "Zend naar lezer"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
-msgid "S"
-msgstr "S"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
-msgid "Fetch news"
-msgstr "Download nieuws"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
-msgid "F"
-msgstr "F"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
-msgid "Convert E-books"
-msgstr "Converteer E-boeken"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
-msgid "C"
-msgstr "C"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
-msgid "V"
-msgstr "V"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
-msgid "Open containing folder"
-msgstr "Open betreffende map"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
-msgid "Show book details"
-msgstr "Laat boek details zien"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
-msgid "Books by same author"
-msgstr "Boeken van dezelfde auteur"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
-msgid "Books in this series"
-msgstr "Boeken in deze serie"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
-msgid "Books by this publisher"
-msgstr "Boeken van deze uitgever"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
-msgid "Books with the same tags"
-msgstr "Boeken met dezelfde labels"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:175
 msgid "Configure calibre"
 msgstr "configueer calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
-msgid "Ctrl+P"
-msgstr "Ctrl+P"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:20
 msgid ""
 "Redirect console output to a dialog window (both stdout and stderr). Useful "
@@ -8210,34 +8422,43 @@ msgstr "Boek heeft geen titel en geen ISBN"
 msgid "No matches found for this book"
 msgstr "Geen overeenkomsten gevonden voor dit boek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:91
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:553
 msgid "Search"
 msgstr "Zoeken"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:313
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:315
 msgid "The selected search will be <b>permanently deleted</b>. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:357
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr "Zoeken (Voor geavanceerd zoeken klik op de knop links)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:392
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:398
 msgid "Saved Searches"
 msgstr "Opgeslagen zoekopdrachten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:46
-msgid "({0} of {1})"
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:406
+msgid "Choose saved search or enter name for new saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:10
+msgid "Restrict to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:48
+msgid "({0} of {1})"
+msgstr "({0} of {1})"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
 msgid "(all books)"
 msgstr "(alle boeken)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:56
 msgid "({0} of all)"
-msgstr ""
+msgstr "({0} van het geheel)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:58
 msgid "Press a key..."
@@ -8317,12 +8538,12 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:207
 msgid "Show all categories"
-msgstr ""
+msgstr "Bekijk alle categorieën"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:214
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:218
 msgid "Manage %s"
-msgstr ""
+msgstr "Beheer %s"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:221
 msgid "Manage Saved Searches"
@@ -8348,7 +8569,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:768
 msgid "Sort by name"
-msgstr ""
+msgstr "Sorteer op naam"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:768
 msgid "Sort by popularity"
@@ -8358,18 +8579,31 @@ msgstr ""
 msgid "Sort by average rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:775
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:772
+msgid "Set the sort order for entries in the Tag Browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:778
 msgid "Match all"
 msgstr "Match alle"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:775
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:778
 msgid "Match any"
 msgstr "Match iedere"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:783
+msgid ""
+"When selecting multiple entries in the Tag Browser match any or all of them"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:787
 msgid "Manage &user categories"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:790
+msgid "Add your own categories to the Tag Browser"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182
 msgid "Convert book %d of %d (%s)"
@@ -8397,15 +8631,15 @@ msgstr "Boeken in de wachtrij voor massa conversie"
 msgid "Queueing "
 msgstr "In Wachtrij "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:239
 msgid "Fetch news from "
 msgstr "Download nieuws van "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:301
 msgid "Convert existing"
 msgstr "Converteer bestaande"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:302
 msgid ""
 "The following books have already been converted to %s format. Do you wish to "
 "reconvert them?"
@@ -8421,55 +8655,45 @@ msgstr "He&rstellen"
 msgid "&Donate to support calibre"
 msgstr "Ondersteun calibre met een &Donatie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:168
 msgid "&Eject connected device"
 msgstr "Aangesloten apparaat ontkoppelen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:173
 msgid "&Restart"
 msgstr "&Herstarten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:206
-msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
-msgstr ""
-"<p>Voor assistentie, zie het <A href=\"\"%s\">Gebruikers handboek</a><br>"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:212
-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/ui.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:227
 msgid "Calibre Quick Start Guide"
 msgstr "Calibre snelstart handboek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:389
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:380
 msgid "Cannot configure"
 msgstr "Kan niet configureren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:376
 msgid "Cannot configure while there are running jobs."
 msgstr "Can niet configueren terwijl bestaande opdrachten bezig zijn"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:381
 msgid "Cannot configure before calibre is restarted."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:424
 msgid "No detailed info available"
 msgstr "Geen details beschikbaar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:425
 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/ui.py:486
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr "Converteer Fout"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:487
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:478
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using third party tools."
@@ -8477,29 +8701,27 @@ msgstr ""
 "<p>Kon %s niet converteren.<p>Het is een eboek met <A HREF=\"%s\">DRM</a>. "
 "Je moet eerst de DRM verwijderen met externe programma's."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:491
 msgid "Recipe Disabled"
 msgstr "Recept uitgeschakeld"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:506
 msgid "<b>Failed</b>"
 msgstr "<b>Mislukt</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:546
 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."
+"you find it useful, please consider donating to support its development. "
+"Your donation helps keep calibre development going."
 msgstr ""
-"is het resultaat van het harde werk van vele vrijwilligers over de hele "
-"wereld. Als je het nuttig vind, overweeg dan svp te doneren om de "
-"ontwikkeling te ondersteunen."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:572
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 "Er zijn actieve werk opdrachten. Weet je zeker dat je af wilt sluiten?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:575
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
@@ -8510,11 +8732,11 @@ msgstr ""
 "apparaat.<br>\n"
 "                      Weet je zeker dat je af wilt sluiten?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:579
 msgid "WARNING: Active jobs"
 msgstr "Waarschuwing: actieve werk opdrachten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:640
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:632
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -8522,19 +8744,11 @@ msgstr ""
 "Zal blijven draaien in het systeemvak. Om het af te sluiten, kies "
 "<b>Afsluiten</b> in het context menu in het systeemvak."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/update.py:52
-msgid ""
-"<span style=\"color:red; font-weight:bold\">Latest version: <a "
-"href=\"%s\">%s</a></span>"
-msgstr ""
-"<span style=\"color:red; font-weight:bold\">Laatste versie: <a "
-"href=\"%s\">%s</a></span>"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/update.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:56
 msgid "Update available"
 msgstr "Update beschikbaar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/update.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:57
 msgid ""
 "%s has been updated to version %s. See the <a href=\"http://calibre-"
 "ebook.com/whats-new\">new features</a>. Visit the download page?"
@@ -8977,7 +9191,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:199
 msgid "F3"
-msgstr ""
+msgstr "F3"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:200
 msgid "Copy to clipboard"
@@ -9001,7 +9215,7 @@ msgstr "Afdrukken"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206
 msgid "Find previous"
-msgstr ""
+msgstr "Zoek vorige"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:207
 msgid "Find previous occurrence"
@@ -9009,111 +9223,51 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:208
 msgid "Shift+F3"
-msgstr ""
+msgstr "Shift+F3"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/printing.py:114
 msgid "Print eBook"
 msgstr "Print eboek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
 msgid "Copy Image"
 msgstr "Afbeelding kopiëren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:240
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:239
 msgid "Paste Image"
 msgstr "Afbeelding Plakken"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:270
-msgid ""
-"Library\n"
-"%d\n"
-"books"
-msgstr ""
-"Bibliotheek\n"
-"%d\n"
-"boeken"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:271
-msgid ""
-"Reader\n"
-"%s\n"
-"available"
-msgstr ""
-"Lezer\n"
-"%s\n"
-"beschikbaar"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:272
-msgid ""
-"Card A\n"
-"%s\n"
-"available"
-msgstr ""
-"Kaart A\n"
-"%s\n"
-"beschikbaar"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:273
-msgid ""
-"Card B\n"
-"%s\n"
-"available"
-msgstr ""
-"Kaart B\n"
-"%s\n"
-"beschikbaar"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:277
-msgid "Click to see the books available on your computer"
-msgstr "Klik hier om de boeken te zien die beschikbaar zijn op uw computer"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:280
-msgid "Click to see the books in the main memory of your reader"
-msgstr "Klik hier om de boeken te zien in het hoofdgeheugen van je lezer"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:281
-msgid "Click to see the books on storage card A in your reader"
-msgstr "Klik hier om de boeken te zien op opslagkaart A in je lezer"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:282
-msgid "Click to see the books on storage card B in your reader"
-msgstr "Klik hier om de boeken te zien op opslagkaart B in je lezer"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:290
-msgid "Books located at"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:364
 msgid "Change Case"
 msgstr "Lettervorm wijzigen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:365
 msgid "Upper Case"
 msgstr "Hoofdletters"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:366
 msgid "Lower Case"
 msgstr "Kleine letters"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:367
 msgid "Swap Case"
 msgstr "Lettervorm Wijzigen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:368
 msgid "Title Case"
 msgstr "Elk Woord Met Hoofdletter"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:974
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:837
 msgid "Drag to resize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:869
 msgid "Show"
-msgstr ""
+msgstr "Weergeven"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1012
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:876
 msgid "Hide"
-msgstr ""
+msgstr "Verberg"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:367
 msgid ""
@@ -9420,11 +9574,11 @@ msgstr "Schakel de &content server in"
 
 #: /home/kovid/work/calibre/src/calibre/library/caches.py:230
 msgid "today"
-msgstr ""
+msgstr "vandaag"
 
 #: /home/kovid/work/calibre/src/calibre/library/caches.py:233
 msgid "yesterday"
-msgstr ""
+msgstr "gisteren"
 
 #: /home/kovid/work/calibre/src/calibre/library/caches.py:236
 msgid "thismonth"
@@ -9438,30 +9592,30 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/library/caches.py:398
 #: /home/kovid/work/calibre/src/calibre/library/caches.py:408
 msgid "no"
-msgstr ""
+msgstr "nee"
 
 #: /home/kovid/work/calibre/src/calibre/library/caches.py:398
 #: /home/kovid/work/calibre/src/calibre/library/caches.py:408
 msgid "unchecked"
-msgstr ""
+msgstr "niet aangevinkt"
 
 #: /home/kovid/work/calibre/src/calibre/library/caches.py:401
 #: /home/kovid/work/calibre/src/calibre/library/caches.py:411
 msgid "checked"
-msgstr ""
+msgstr "aangevinkt"
 
 #: /home/kovid/work/calibre/src/calibre/library/caches.py:401
 #: /home/kovid/work/calibre/src/calibre/library/caches.py:411
 msgid "yes"
-msgstr ""
+msgstr "ja"
 
 #: /home/kovid/work/calibre/src/calibre/library/caches.py:405
 msgid "blank"
-msgstr ""
+msgstr "leeg"
 
 #: /home/kovid/work/calibre/src/calibre/library/caches.py:405
 msgid "empty"
-msgstr ""
+msgstr "leeg"
 
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:41
 msgid ""
@@ -9752,7 +9906,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:288
 msgid "Set the ISBN of the added empty book"
-msgstr ""
+msgstr "Leg de ISBN code van het toegevoegde lege boek vast"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:313
 msgid "You must specify at least one file to add"
@@ -9917,6 +10071,12 @@ msgid ""
 "column.\n"
 "datatype is one of: {0}\n"
 msgstr ""
+"%prog add_custom_column [options] label name datatype\n"
+"\n"
+"Creëer een zelf gedefinieerde kolom. label is de naam van de kolom die door "
+"de computer wordt gebruikt. Dit label mag geen spaties of dubbele punten "
+"bevatten: name is de aan de menselijke taal aangepaste naam van de kolom.\n"
+"datatype is één van: {0}\n"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:556
 msgid ""
@@ -10443,10 +10603,8 @@ msgid "User-created tag browser categories"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:702
-msgid "Preserve all collections even if not in library metadata."
+msgid "How and when calibre updates metadata on the device."
 msgstr ""
-"Onthoud alle collecties zelfs als deze zich niet in de metagegevens van de "
-"bibliotheek bevinden"
 
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:43
 msgid "Waiting..."
@@ -10617,83 +10775,83 @@ msgstr "Onbekende Nieuwe Bron"
 msgid "The \"%s\" recipe needs a username and password."
 msgstr "Het \"%s\" recept heeft een gebruikernaam en wachtwoord nodig"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:706
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:708
 msgid "Download finished"
 msgstr "Download voltooid"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:708
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:710
 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:714
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:716
 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:716
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:718
 msgid " from "
 msgstr " van "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:718
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:720
 msgid "\tFailed links:"
 msgstr "\tMislukte links:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:807
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:809
 msgid "Could not fetch article. Run with -vv to see the reason"
 msgstr "Kan artikel niet ophalen. Voer uit met optie -vv om oorzaak te zien"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:828
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:830
 msgid "Fetching feeds..."
 msgstr "Downloading feeds..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:833
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:835
 msgid "Got feeds from index page"
 msgstr "feeds van index pagina"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:839
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:841
 msgid "Trying to download cover..."
 msgstr "Probeer omslag te downloaden"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:841
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Generating masthead..."
 msgstr "Genereren Colofon..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:922
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:924
 msgid "Starting download [%d thread(s)]..."
 msgstr "Begin download [%d thread(s)]..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:938
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:940
 msgid "Feeds downloaded to %s"
 msgstr "Feeds gedownload tot %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:948
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:950
 msgid "Could not download cover: %s"
 msgstr "Kon omslag niet downloaden: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:960
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
 msgid "Downloading cover from %s"
 msgstr "Download omslag van %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1002
 msgid "Masthead image downloaded"
 msgstr "Colofon plaatje gedownload"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1190
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1192
 msgid "Untitled Article"
 msgstr "Artikel zonder Naam"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1261
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1263
 msgid "Article downloaded: %s"
 msgstr "Artikel gedownload: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1272
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1274
 msgid "Article download failed: %s"
 msgstr "Artikel download mislukt: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1289
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1291
 msgid "Fetching feed"
 msgstr "Downloading feed"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1436
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1438
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
@@ -10701,7 +10859,7 @@ msgstr ""
 "Inloggen niet gelukt. Controleer je gebruikersnaam en wachtwoord voor de "
 "calibre periodiekendienst."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1452
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1454
 msgid ""
 "You do not have permission to download this issue. Either your subscription "
 "has expired or you have exceeded the maximum allowed downloads for today."
@@ -11419,6 +11577,10 @@ msgstr "Download geen CSS stylesheets"
 #~ msgid "Send to storage card"
 #~ msgstr "Stuur naar opslag kaart"
 
+#~ 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>"
+
 #~ msgid ""
 #~ "<p>Books with the same title as the following already exist in the database. "
 #~ "Add them anyway?<ul>"
@@ -11470,6 +11632,13 @@ msgstr "Download geen CSS stylesheets"
 #~ "<p>Een ongeldige database bestaat op %s, verwijder deze voordat je probeert "
 #~ "de bestaande database te verplaatsen.<br>Foutmelding: %s"
 
+#~ msgid ""
+#~ "<span style=\"color:red; font-weight:bold\">Latest version: <a "
+#~ "href=\"%s\">%s</a></span>"
+#~ msgstr ""
+#~ "<span style=\"color:red; font-weight:bold\">Laatste versie: <a "
+#~ "href=\"%s\">%s</a></span>"
+
 #~ msgid ""
 #~ "Search the list of books by title or author<br><br>Words separated by spaces "
 #~ "are ANDed"
@@ -11484,6 +11653,9 @@ msgstr "Download geen CSS stylesheets"
 #~ "Zoek de boekenlijst op titel, auteur, uitgeverij, tags of "
 #~ "opmerkingen.<br><br>Meerdere woorden met spaties worden allen gebruikt."
 
+#~ msgid "Convert E-books"
+#~ msgstr "Converteer E-boeken"
+
 #~ msgid "Click to browse books by their covers"
 #~ msgstr "Klik om boeken bij hun omslag te bekijken"
 
@@ -11984,18 +12156,66 @@ msgstr "Download geen CSS stylesheets"
 #~ msgid "Sort by &popularity"
 #~ msgstr "Sorteer bij &populariteit"
 
+#~ msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
+#~ msgstr ""
+#~ "<p>Voor assistentie, zie het <A href=\"\"%s\">Gebruikers handboek</a><br>"
+
 #~ msgid "Invalid library location"
 #~ msgstr "Ongeldige bibliotheek locatie"
 
 #~ msgid "Could not access %s. Using %s as the library."
 #~ msgstr "Geen toegang tot %s. Gebruik %s als bibliotheek."
 
+#~ 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 ""
+#~ "is het resultaat van het harde werk van vele vrijwilligers over de hele "
+#~ "wereld. Als je het nuttig vind, overweeg dan svp te doneren om de "
+#~ "ontwikkeling te ondersteunen."
+
 #~ msgid "Double click to change a keyborad shortcut"
 #~ msgstr "Dubbel klik om een keyboard snelkoppeling te wijzigen"
 
 #~ msgid "Ebook Viewer"
 #~ msgstr "Eboek Viewer"
 
+#~ msgid ""
+#~ "Card A\n"
+#~ "%s\n"
+#~ "available"
+#~ msgstr ""
+#~ "Kaart A\n"
+#~ "%s\n"
+#~ "beschikbaar"
+
+#~ msgid ""
+#~ "Card B\n"
+#~ "%s\n"
+#~ "available"
+#~ msgstr ""
+#~ "Kaart B\n"
+#~ "%s\n"
+#~ "beschikbaar"
+
+#~ msgid ""
+#~ "Reader\n"
+#~ "%s\n"
+#~ "available"
+#~ msgstr ""
+#~ "Lezer\n"
+#~ "%s\n"
+#~ "beschikbaar"
+
+#~ msgid ""
+#~ "Library\n"
+#~ "%d\n"
+#~ "books"
+#~ msgstr ""
+#~ "Bibliotheek\n"
+#~ "%d\n"
+#~ "boeken"
+
 #~ msgid "The author sort string"
 #~ msgstr "De auteur sorteer sleutel"
 
@@ -12106,3 +12326,14 @@ msgstr "Download geen CSS stylesheets"
 
 #~ msgid "Merge books"
 #~ msgstr "Boeken samenvoegen"
+
+#~ msgid "  "
+#~ msgstr "  "
+
+#~ msgid "Preserve device collections."
+#~ msgstr "Bewaar collecties op het apparaat"
+
+#~ msgid "Preserve all collections even if not in library metadata."
+#~ msgstr ""
+#~ "Onthoud alle collecties zelfs als deze zich niet in de metagegevens van de "
+#~ "bibliotheek bevinden"
diff --git a/src/calibre/translations/pl.po b/src/calibre/translations/pl.po
index 1a71f22de6..503bf7dbc0 100644
--- a/src/calibre/translations/pl.po
+++ b/src/calibre/translations/pl.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-07-03 01:21+0000\n"
-"PO-Revision-Date: 2010-07-02 18:24+0000\n"
+"POT-Creation-Date: 2010-07-10 16:12+0000\n"
+"PO-Revision-Date: 2010-07-16 08:46+0000\n"
 "Last-Translator: Bartosz Kaszubowski <gosimek@gmail.com>\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: 2010-07-03 03:45+0000\n"
+"X-Launchpad-Export-Date: 2010-07-17 03:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
@@ -27,10 +27,10 @@ msgstr "Ta opcja zupełnie nic nie zmienia"
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:71
 #: /home/kovid/work/calibre/src/calibre/devices/prs500/books.py:267
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:466
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:396
-#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:98
-#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:101
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:492
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:398
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:97
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:100
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/metadata.py:56
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:428
 #: /home/kovid/work/calibre/src/calibre/ebooks/fb2/input.py:67
@@ -72,9 +72,9 @@ msgstr "Ta opcja zupełnie nic nie zmienia"
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:818
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:49
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:51
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:910
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:915
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:981
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:911
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:916
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:982
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:137
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:139
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:108
@@ -102,20 +102,20 @@ msgstr "Ta opcja zupełnie nic nie zmienia"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:233
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:290
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:815
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:818
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:814
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:817
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:172
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:179
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:22
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:135
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:903
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:912
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1192
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1195
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:899
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:908
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1191
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1194
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:120
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:155
@@ -123,8 +123,8 @@ msgstr "Ta opcja zupełnie nic nie zmienia"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:172
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:362
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:877
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1054
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:882
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1060
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:87
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:92
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:185
@@ -170,7 +170,7 @@ msgstr "Zapisywanie metadanych"
 msgid "Catalog generator"
 msgstr "Generator katalogu"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:15
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:16
 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 "
@@ -180,7 +180,7 @@ msgstr ""
 "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:51
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:52
 msgid ""
 "Character encoding for the input HTML files. Common choices include: cp1252, "
 "latin1, iso-8859-1 and utf-8."
@@ -188,7 +188,7 @@ msgstr ""
 "Kodowanie znaków dla źródłowych plików HTML. Popularne wybory to: cp1252, "
 "latin1, iso-8859-1 i utf-8."
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:58
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:59
 msgid ""
 "Create a PMLZ archive containing the PML file and all images in the "
 "directory pmlname_img or images. This plugin is run every time you add a PML "
@@ -198,49 +198,49 @@ msgstr ""
 "pmlname_img lub images. Plugin ten jest uruchamiany przy każdym dodaniu "
 "pliku PML do biblioteki."
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:90
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:93
 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:117
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:128
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:140
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:150
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:160
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:171
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:181
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:191
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:201
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:211
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:221
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:232
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:243
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:255
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:276
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:287
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:297
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:307
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:120
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:131
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:153
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:163
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:174
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:184
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:194
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:204
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:214
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:224
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:235
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:246
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:258
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:279
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:290
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:300
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:310
 msgid "Read metadata from %s files"
 msgstr "Odczytaj metadane z %s plików"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:266
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:269
 msgid "Read metadata from ebooks in RAR archives"
 msgstr "Odczyt metadanych z e-booków w archiwach RAR"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:318
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:321
 msgid "Read metadata from ebooks in ZIP archives"
 msgstr "Odczyt metadanych z e-booków w archiwach ZIP"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:331
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:341
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:351
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:373
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:384
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:394
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:334
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:344
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:354
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:376
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:387
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:397
 msgid "Set metadata in %s files"
 msgstr "Ustaw metadane w %s plikach"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:362
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:365
 msgid "Set metadata from %s files"
 msgstr "Pobierz metadane z %s plików"
 
@@ -402,35 +402,35 @@ msgstr ""
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr "Ten profil przeznaczony jest dla urządzenia Amazon Kindle DX."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:31
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
 msgid "Installed plugins"
 msgstr "Zainstalowane wtyczki"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:33
 msgid "Mapping for filetype plugins"
 msgstr "Mapowanie wtyczek dla róznych typów plików"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:33
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:34
 msgid "Local plugin customization"
 msgstr "Lokalne dostosowanie wtyczek"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:34
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
 msgid "Disabled plugins"
 msgstr "Wyłączone wtyczki"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
 msgid "Enabled plugins"
 msgstr "Załączone wtyczki"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:83
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:84
 msgid "No valid plugin found in "
 msgstr "Nie znaleziono wtyczki w "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:460
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:468
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr "Inicjacja wtyczki %s nie udała się - prześledź komunikaty:"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:493
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
 msgid ""
 "    %prog options\n"
 "\n"
@@ -442,16 +442,16 @@ msgstr ""
 "    Spersonalizuj calibre poprzez załadowanie zewnętrznych wtyczek\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:499
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
 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:501
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 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:503
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:511
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
@@ -459,15 +459,15 @@ msgstr ""
 "Dostosuj wtyczkę. Wprowadź nazwę wtyczki i polecenie dostosowujące "
 "oddzielając przecinkami."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:505
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:513
 msgid "List all installed plugins"
 msgstr "Wyświetl wszystkie zainstalowane wtyczki"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Enable the named plugin"
 msgstr "Włącz wtyczkę"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Disable the named plugin"
 msgstr "Wyłącz wtyczkę"
 
@@ -489,7 +489,7 @@ msgstr "Umożliwia komunikację z telefonami S60."
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:87
 msgid "Communicate with iTunes/iBooks."
-msgstr ""
+msgstr "Umożliwia komunikację z aplikacjami iTunes/iBooks."
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:93
 msgid "Apple device detected, launching iTunes, please wait ..."
@@ -517,7 +517,7 @@ msgstr "zakończone"
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:544
 msgid "Use Series as Category in iTunes/iBooks"
-msgstr ""
+msgstr "Używaj serii jako kategorii w iTunes/iBooks"
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:546
 msgid "Cache covers from iTunes/iBooks"
@@ -529,12 +529,17 @@ msgid ""
 "Delete using the iBooks app.\n"
 "Click 'Show Details' for a list."
 msgstr ""
+"Niektóre książki nie zostały znalezione w bazie danych iTunes.\n"
+"Usuwam używając aplikacji iBooks.\n"
+"Kliknij 'Pokaż szczegóły', aby zobaczyć listę."
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:886
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
 msgstr ""
+"Niektóre grafiki okładek nie mogły zostać przekonwertowane.\n"
+"Kliknij 'Pokaż szczegóły', aby zobaczyć listę."
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2471
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:807
@@ -550,7 +555,7 @@ msgstr "Aktualności"
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2698
 msgid "Communicate with iTunes."
-msgstr ""
+msgstr "Umożliwia komunikację z aplikacją iTunes"
 
 #: /home/kovid/work/calibre/src/calibre/devices/binatone/driver.py:17
 msgid "Communicate with the Binatone Readme eBook reader."
@@ -576,7 +581,7 @@ msgstr "Umożliwia komunikację z czytnikiem książek EB600."
 
 #: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:193
 msgid "Communicate with the Astak Mentor EB600"
-msgstr ""
+msgstr "Umożliwia komunikację z czytnikiem Astak Mentor EB600"
 
 #: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:216
 msgid "Communicate with the PocketBook 301 reader."
@@ -601,7 +606,7 @@ msgstr "Umożliwia komunikację z czytnikiem książek Sigmatek."
 #: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:16
 #: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:30
 msgid "Use an arbitrary folder as a device."
-msgstr ""
+msgstr "Użyj dowolnego folderu jako urządzenia."
 
 #: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:26
 #: /home/kovid/work/calibre/src/calibre/devices/interface.py:23
@@ -620,7 +625,7 @@ msgstr "Umożliwia komunikację z czytnikiem książek Hanlin V5."
 msgid "Communicate with the BOOX eBook reader."
 msgstr "Umożliwia komunikację z czytnikiem książek BOOX."
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:121
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:123
 msgid ""
 "Comma separated list of directories to send e-books to on the device. The "
 "first one that exists will be used."
@@ -691,34 +696,34 @@ msgstr "Umożliwia komunikację z czytnikiem Kobo Reader."
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:51
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:54
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:57
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:157
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:159
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:64
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:67
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:70
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:130
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:137
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:160
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:139
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:162
 msgid "Getting list of books on device..."
 msgstr "Pobieranie listy książek znajdujących się na urządzeniu"
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:218
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:258
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:244
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:262
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:219
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:263
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:246
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:264
 msgid "Removing books from device..."
 msgstr "Usuwanie książek z urządzenia..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:262
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:269
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:269
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:274
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:267
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:274
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:271
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:276
 msgid "Removing books from device metadata listing..."
 msgstr "Usuwanie książki z urządzenia metadanych lista"
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:274
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:308
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:208
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:238
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:313
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:210
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:240
 msgid "Adding books to device metadata listing..."
 msgstr "Dodanie książki do urządzenia metadanych lista..."
 
@@ -732,7 +737,11 @@ msgstr "Umożliwia komunikację z czytnikiem Booq Avant"
 
 #: /home/kovid/work/calibre/src/calibre/devices/misc.py:55
 msgid "Communicate with the Sweex MM300"
-msgstr ""
+msgstr "Umożliwia komunikację z czytnikiem Sweex MM300."
+
+#: /home/kovid/work/calibre/src/calibre/devices/misc.py:75
+msgid "Communicate with the Pandigital Novel"
+msgstr "Umożliwia komunikację z czytnikiem Pandigital Novel."
 
 #: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:17
 msgid "Communicate with the Nokia 770 internet tablet."
@@ -744,7 +753,7 @@ msgstr "Umożliwia komunikację z tabletem internetowym Nokia 810."
 
 #: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:74
 msgid "Communicate with the Nokia E52"
-msgstr ""
+msgstr "Umożliwia komunikację z telefonem Nokia E52."
 
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:20
 msgid "The Nook"
@@ -883,12 +892,12 @@ msgstr "Umożliwia komunikację z czytnikiem książek."
 msgid "Get device information..."
 msgstr "Pobierz informacje o urządzeniu..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:188
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:192
 msgid "Transferring books to device..."
 msgstr "Przenoszenie książek na urządzenie..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:305
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:307
 msgid "Sending metadata to device..."
 msgstr "Przesyłanie danych meta do urządzenia..."
 
@@ -1263,6 +1272,9 @@ msgid ""
 "preference to the auto-generated one. With this option, the auto-generated "
 "one is always used."
 msgstr ""
+"Zazwyczaj, jeżeli plik źródłowy ma już spis treści, jest on używany zamiast "
+"wygenerowanego automatycznie. Z tą opcją, wygenerowany automatycznie spis "
+"treści jest zawsze używany."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:213
 msgid "Don't add auto-detected chapters to the Table of Contents."
@@ -1557,6 +1569,51 @@ msgstr "Wykonywanie przekształceń na książce..."
 msgid "Creating"
 msgstr "Tworzenie"
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/__init__.py:18
+msgid "ePub Fixer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/epubcheck.py:18
+msgid "Workaround epubcheck bugs"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/epubcheck.py:22
+msgid ""
+"Workarounds for bugs in the latest release of epubcheck. epubcheck reports "
+"many things as errors that are not actually errors. epub-fix will try to "
+"detect these and replace them with constructs that epubcheck likes. This may "
+"cause significant changes to your epub, complain to the epubcheck project."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:19
+msgid ""
+"%prog [options] file.epub\n"
+"\n"
+"Fix common problems in EPUB files that can cause them to be rejected by "
+"poorly designed publishing services.\n"
+"\n"
+"By default, no fixing is done and messages are printed out for each error "
+"detected. Use the options to control which errors are automatically fixed."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:50
+msgid "You must specify an epub file"
+msgstr "Musisz wybrać plik EPUB"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:17
+msgid "Fix unmanifested files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:21
+msgid ""
+"Fix unmanifested files. epub-fix can either add them to the manifest or "
+"delete them as specified by the delete unmanifested option."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:32
+msgid "Delete unmanifested files instead of adding them to the manifest"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:56
 msgid ""
 "Extract the contents of the generated EPUB file to the specified directory. "
@@ -1612,7 +1669,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:169
 msgid "Start"
-msgstr ""
+msgstr "Rozpocznij"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/fb2/fb2ml.py:144
 #: /home/kovid/work/calibre/src/calibre/ebooks/rb/rbml.py:102
@@ -1898,11 +1955,11 @@ msgstr "Komiks"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:98
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:882
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:887
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:543
 msgid "Title"
 msgstr "Tytuł"
@@ -1911,7 +1968,7 @@ msgstr "Tytuł"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:364
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:883
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:888
 msgid "Author(s)"
 msgstr "Autor(rzy)"
 
@@ -1934,7 +1991,7 @@ msgstr "Producent"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:67
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:318
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1073
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1079
 msgid "Comments"
 msgstr "Komentarze"
 
@@ -1943,7 +2000,7 @@ msgstr "Komentarze"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:306
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1069
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1075
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:139
 msgid "Tags"
 msgstr "Etykiety"
@@ -1953,7 +2010,7 @@ msgstr "Etykiety"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:323
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1084
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:87
 msgid "Series"
 msgstr "Seria"
@@ -1963,7 +2020,7 @@ msgid "Language"
 msgstr "Język"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:406
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1067
 msgid "Timestamp"
 msgstr "Data"
 
@@ -2086,7 +2143,7 @@ msgstr "Nie znaleziono okładki"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/covers.py:15
 msgid "Cover download"
-msgstr ""
+msgstr "Pobiranie okładki"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/douban.py:42
 msgid "Downloads metadata from Douban.com"
@@ -2134,7 +2191,7 @@ msgstr "Pobierz metadane społecznościowe z amazon.com"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:213
 msgid "Downloads series/tags/rating information from librarything.com"
-msgstr ""
+msgstr "Pobieraj serię/etykiety/oceny z librarything.com"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:95
 msgid ""
@@ -2198,7 +2255,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1226
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1398
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1399
 msgid "Cover"
 msgstr "Okładka"
 
@@ -2238,71 +2295,72 @@ msgstr "Wszystkie artykuły"
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:258
 msgid "This is an Amazon Topaz book. It cannot be processed."
 msgstr ""
+"To jest książka z czytnika Amazon Topaz. Nie może ona zostać przetworzona."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1399
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1400
 msgid "Title Page"
 msgstr "Strona tytułowa"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1400
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1401
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:15
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:53
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:194
 msgid "Table of Contents"
 msgstr "Spis treści"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1401
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1402
 msgid "Index"
 msgstr "Spis"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1402
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1403
 msgid "Glossary"
 msgstr "Słowniczek"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1403
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1404
 msgid "Acknowledgements"
 msgstr "Podziękowania"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1404
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1405
 msgid "Bibliography"
 msgstr "Bibliografia"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1405
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1406
 msgid "Colophon"
 msgstr "Kolofon"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1406
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1407
 msgid "Copyright"
 msgstr "Prawa autorskie"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1407
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1408
 msgid "Dedication"
 msgstr "Dedykacja"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1408
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1409
 msgid "Epigraph"
 msgstr "Epigraf"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1409
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1410
 msgid "Foreword"
 msgstr "Przedsłowie"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1410
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1411
 msgid "List of Illustrations"
 msgstr "Lista ilustracji"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1411
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1412
 msgid "List of Tables"
 msgstr "Lista tabel"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1412
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1413
 msgid "Notes"
 msgstr "Notatki"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1413
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1414
 msgid "Preface"
 msgstr "Wstęp"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1414
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1415
 msgid "Main Text"
 msgstr "Tekst główny"
 
@@ -2348,7 +2406,7 @@ msgstr "Pasek boczny"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:22
 #: /home/kovid/work/calibre/src/calibre/ebooks/tcr/input.py:23
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:23
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:24
 msgid ""
 "Normally calibre treats blank lines as paragraph markers. With this option "
 "it will assume that every line represents a paragraph instead."
@@ -2356,7 +2414,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:26
 #: /home/kovid/work/calibre/src/calibre/ebooks/tcr/input.py:27
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:27
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:28
 msgid ""
 "Normally calibre treats blank lines as paragraph markers. With this option "
 "it will assume that every line starting with an indent (either a tab or 2+ "
@@ -2491,7 +2549,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
 msgid "Author"
 msgstr "Autor"
@@ -2638,19 +2696,19 @@ msgstr ""
 "kompresja, ale najszybsze generowanie dokumentu, a 10 to najwyższa "
 "kompresja, ale najwolniejsze generowanie dokumentu."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:33
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:34
 msgid ""
 "Normally extra spaces are condensed into a single space. With this option "
 "all spaces will be displayed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:36
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:37
 msgid ""
 "Run the text input through the markdown pre-processor. To learn more about "
 "markdown see"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:39
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:40
 msgid "Do not insert a Table of Contents into the output text."
 msgstr "Nie wstawiaj spisu treści do dokumentu wyjśćiowego."
 
@@ -2818,7 +2876,7 @@ msgstr "Kopiuj"
 msgid "Copy to Clipboard"
 msgstr "Kopiuj do schowka"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:400
 msgid "Choose Files"
 msgstr "Wybiesz pliki"
 
@@ -2833,13 +2891,13 @@ msgid "User annotations generated from main library only"
 msgstr "Użyj tylko adnotacji wygenerowanych na podstawie biblioteki"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:75
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:612
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:671
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:708
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:729
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:877
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1060
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:670
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:707
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:728
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:876
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:941
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1059
 msgid "No books selected"
 msgstr "Nie wybrano ksiązek"
 
@@ -2879,143 +2937,143 @@ msgstr "Jak wiele pustych książek?"
 msgid "How many empty books should be added?"
 msgstr "Jak wiele pustych książek powinno zostać dodanych?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:340
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:390
 msgid "Uploading books to device."
 msgstr "Przesyłam książki na urządzenie."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:350
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:137
 msgid "Books"
 msgstr "Książki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
 msgid "EPUB Books"
 msgstr "Książki EPUB"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
 msgid "LRF Books"
 msgstr "Książki LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
 msgid "HTML Books"
 msgstr "Książki HTML"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
 msgid "LIT Books"
 msgstr "Książki LIT"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
 msgid "MOBI Books"
 msgstr "Książki MOBI"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
 msgid "Topaz books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
 msgid "Text books"
 msgstr "Książki tekstowe"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:359
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
 msgid "PDF Books"
 msgstr "Książki PDF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:359
 msgid "Comics"
 msgstr "Komiksy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:360
 msgid "Archives"
 msgstr "Archiwa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:364
 msgid "Supported books"
 msgstr "Wspierane książki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:399
 msgid "Merged some books"
 msgstr "Scal niektóre książki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:401
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:400
 msgid ""
 "Some duplicates were found and merged into the following existing books:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:409
 msgid "Failed to read metadata"
 msgstr "Nie można było odczytać metadanych"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:410
 msgid "Failed to read metadata from the following"
 msgstr "Nie można było odczytać metadanych z nastepujących"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:434
 msgid "Add to library"
-msgstr ""
+msgstr "Dodaj do biblioteki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:460
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1229
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:459
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1228
 msgid "No book selected"
 msgstr "Nie wybrano ksiązki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:434
 msgid "No book files found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:456
 msgid "Cannot delete"
 msgstr "Usunięcie niemożliwe."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:469
 msgid "Choose formats to be deleted"
 msgstr "Wybierz formaty do usunięcia"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:488
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:487
 msgid "Choose formats <b>not</b> to be deleted"
 msgstr "Wybierz formaty, które <b>nie</b> zostaną usunięte"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:507
 msgid "Cannot delete books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:509
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:508
 msgid "No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:519
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:518
 msgid "Main memory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:520
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:444
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:519
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:454
 msgid "Storage Card A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:521
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:446
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:455
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:447
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:456
 msgid "Storage Card B"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:525
 msgid "No books to delete"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:526
 msgid "None of the selected books are on the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:544
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:600
 msgid "Deleting books from device."
 msgstr "Usuwanie książek z urządzenia."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:564
 msgid ""
 "The selected books will be <b>permanently deleted</b> and the files removed "
 "from your computer. Are you sure?"
@@ -3023,67 +3081,67 @@ msgstr ""
 "Wybrane książki będą <b>permanentnie usunięte</b> i ich pliki zostaną "
 "usunięte z twojego komputera. Jesteś pewny?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:585
 msgid ""
 "The selected books will be <b>permanently deleted</b> from your device. Are "
 "you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:610
 msgid "Cannot download metadata"
 msgstr "Nie można obrac metadanych"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:627
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
 msgid "social metadata"
 msgstr "metadane społecznościowe"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
 msgid "covers"
 msgstr "okładki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
 msgid "metadata"
 msgstr "metadane"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:630
 msgid "Downloading %s for %d book(s)"
 msgstr "Pobieram %s dla %d książki(ek)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:654
 msgid "Failed to download some metadata"
 msgstr "Nie udało się pobrać niektórych metadanych"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:656
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
 msgid "Failed to download metadata for the following:"
 msgstr "Nie udało się pobrać metadanych dla następujących e-ksiązek:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:659
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:658
 msgid "Failed to download metadata:"
 msgstr "Nie udało się pobrać metadanych:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:660
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:637
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:522
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:949
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:659
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:638
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:951
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
 msgid "Error"
 msgstr "Błąd"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:670
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:707
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:669
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:706
 msgid "Cannot edit metadata"
 msgstr "Nie można edytować metadanych"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:728
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:731
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:727
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:730
 msgid "Cannot merge books"
 msgstr "Nie można połączyć książek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:732
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:731
 msgid "At least two books must be selected for merging"
 msgstr "Conajmniej dwie książki muszą zostać wybrane, aby móc je połączyć"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:736
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:735
 msgid ""
 "All book formats and metadata from the selected books will be added to the "
 "<b>first selected book.</b><br><br> The second and subsequently selected "
@@ -3091,7 +3149,7 @@ msgid ""
 "proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:747
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:746
 msgid ""
 "All book formats and metadata from the selected books will be merged into "
 "the <b>first selected book</b>.<br><br>After merger the second and "
@@ -3101,7 +3159,7 @@ msgid ""
 "from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:759
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:758
 msgid ""
 "You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
 "proceed?"
@@ -3109,93 +3167,93 @@ msgstr ""
 "Chcesz połączyć więcej niż 5 książek. Jesteś <b>pewien</b>, że chcesz "
 "kontynuować?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:876
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:875
 msgid "Cannot save to disk"
 msgstr "Nie można zapisać na dysku"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:878
 msgid "Choose destination directory"
 msgstr "Wyberz folder docelowy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:912
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:911
 msgid "Error while saving"
 msgstr "Błąd podczas zapisywania"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:913
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:912
 msgid "There was an error while saving."
 msgstr "Wysapił błąd podczas zapisywania."
 
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:919
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:920
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:921
 msgid "Could not save some books"
 msgstr "Nie można była zapisać niektórych książek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:922
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:921
 msgid "Click the show details button to see which ones."
 msgstr "Kliknij \"Pokaż szczegóły\", aby zobaczyć które."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
 msgid "No books selected to generate catalog for"
 msgstr "Brak książek do wygenerowania katalogu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:960
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:959
 msgid "Generating %s catalog..."
 msgstr "Generowanie katalogu %s..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:965
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:964
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:264
 msgid "No books found"
 msgstr "Nie znaleziono książek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:966
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:965
 msgid ""
 "No books to catalog\n"
 "Check exclude tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:976
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:975
 msgid "Catalog generated."
 msgstr "Katalog wygenerowany"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:979
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:978
 msgid "Export Catalog Directory"
 msgstr "Eksportuj folder katalogu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:980
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:979
 msgid "Select destination for %s.%s"
 msgstr "Wybierz folder docelowy dla %s.%s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:996
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:995
 msgid "Fetching news from "
 msgstr "Pobieranie aktualności z "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1009
 msgid " fetched."
 msgstr " - pobrano."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1059
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1058
 msgid "Cannot convert"
 msgstr "Nie można przekonwertować"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1088
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1087
 msgid "Starting conversion of %d book(s)"
 msgstr "Rozpoczynam konwersję %d książki(ek)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1265
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1264
 msgid "Cannot view"
 msgstr "Nie można wyświetlić"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1209
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
 msgid "Choose the format to view"
 msgstr "Wybierz format do wyświetlenia"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1218
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1217
 msgid "Multiple Books Selected"
 msgstr "Wybrano wiele książek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1219
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1218
 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 "
@@ -3203,11 +3261,11 @@ msgid ""
 "continue?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1227
 msgid "Cannot open folder"
 msgstr "Nie można otworzyć folderu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1266
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1265
 msgid "%s has no available formats."
 msgstr "%s nie ma dostępnych formatów."
 
@@ -3232,7 +3290,7 @@ msgid "The specified directory could not be processed."
 msgstr "Wybrany folder nie może byc przetworzony."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:845
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr "Brak książek"
 
@@ -3356,15 +3414,15 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:52
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:633
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:637
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:366
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:371
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:385
@@ -3388,12 +3446,12 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:259
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:265
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:186
@@ -3423,8 +3481,9 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:313
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1059
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1065
 msgid "Path"
 msgstr "Ścieżka"
 
@@ -3441,32 +3500,32 @@ msgid "Formats"
 msgstr "Formaty"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:25
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:886
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1062
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:891
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1068
 msgid "Collections"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:56
 msgid "Click to open"
-msgstr ""
+msgstr "Kliknij, aby otworzyć"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:305
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:311
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:317
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1068
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1072
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1074
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:458
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:274
 msgid "None"
 msgstr "Brak"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:310
 msgid "Click to open Book Details window"
-msgstr ""
+msgstr "Kliknij, aby otworzyć szczegóły ksiązki w oknie"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml.py:16
 msgid "CSV/XML Options"
@@ -4309,12 +4368,12 @@ msgid "Footer regular expression:"
 msgstr "Wyrażenie regularne dla stopki:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:56
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:76
 msgid "Invalid regular expression"
 msgstr "Nieprawidłowe wyrażenie regularne"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:77
 msgid "Invalid regular expression: %s"
 msgstr "Niewłaściwe wyrażenie regularne: %s"
 
@@ -4524,11 +4583,11 @@ msgid ""
 "href=\"http://calibre-ebook.com/user_manual/xpath.html\">XPath Tutorial</a>."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:127
 msgid "Cover browser could not be loaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:179
 msgid "Browse by covers"
 msgstr "Przeglądaj po okładkach"
 
@@ -4587,124 +4646,124 @@ msgstr ""
 msgid "tags to remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:49
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:135
 msgid "No details available."
 msgstr "Brak szczegółów."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:155
 msgid "Device no longer connected."
 msgstr "Urządzenie zostało już odłączone."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:270
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:271
 msgid "Get device information"
 msgstr "Pobierz informacje o urządzeniach"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:282
 msgid "Get list of books on device"
 msgstr "Pozyskaj listę książek na urządzeniu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:292
 msgid "Get annotations from device"
 msgstr "Pobierz adnotacje  z urządzenia"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:301
 msgid "Send metadata to device"
 msgstr "Prześlij metadane do urządzenia"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:305
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:306
 msgid "Send collections to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:330
 msgid "Upload %d books to device"
 msgstr "Prześlij %d książek na urządzenie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:345
 msgid "Delete books from device"
 msgstr "Usuń książki na urządzeniu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:362
 msgid "Download books from device"
 msgstr "Pobierz książki z urządzenia"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:372
 msgid "View book on device"
 msgstr "Zobacz ksiązki na urządzeniu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:408
 msgid "Set default send to device action"
 msgstr "Ustaw domyślne działanie przesyłania na urządzenie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:413
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:420
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:422
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:425
 msgid "Email to"
 msgstr "Prześlij emailem do"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:425
 msgid " and delete from library"
-msgstr ""
+msgstr " i usuń z biblioteki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:434
 msgid "Send to main memory"
 msgstr "Prześlij do głównej pamięci"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:436
 msgid "Send to storage card A"
 msgstr "Prześlij na kartę pamięci A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:437
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:438
 msgid "Send to storage card B"
 msgstr "Prześlij na kartę pamięci B"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:442
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:452
 msgid "Main Memory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:469
-msgid "Send and delete from library"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:470
+msgid "Send and delete from library"
+msgstr "Wyślij i usuń z biblioteki"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:471
 msgid "Send specific format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:509
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:510
 msgid "Connect to folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:516
 msgid "Connect to iTunes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:521
 msgid "Eject device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:529
 msgid "Fetch annotations (experimental)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:638
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:639
 msgid "Error communicating with device"
 msgstr "Błąd podczas komunikacji z urządzeniem"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:659
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:660
 msgid "Select folder to open as device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:704
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:705
 msgid "Failed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:710
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:711
 msgid "Error talking to device"
 msgstr "Błąd komunikacji z urządzeniem"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:711
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:712
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -4712,128 +4771,124 @@ msgstr ""
 "Wystąpił chwilowy błąd komunikacji z urządzeniem. Odłącz i podłącz je "
 "ponownie lub uruchom komputer ponownie."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:753
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:754
 msgid "Device: "
 msgstr "Urządzenie: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:755
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:756
 msgid " detected."
 msgstr " wykryte"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:778
-msgid "Connected "
-msgstr "Połączone "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:846
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr "wybranych do wysłania"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:851
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:847
 msgid "Choose format to send to device"
 msgstr "Wybierz format plików przesyłanych na urządzenie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:860
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:856
 msgid "No device"
 msgstr "Brak urządzenia"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:857
 msgid "Cannot send: No device is connected"
 msgstr "Nie można było przesłać: Żadne urządenie nie jest podłączone"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:860
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:868
 msgid "No card"
 msgstr "Brak karty"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:869
 msgid "Cannot send: Device has no storage card"
 msgstr "Nie można przesłać: Urządzenie nie posiada karty pamięci"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:910
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:906
 msgid "E-book:"
 msgstr "E-book:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:913
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:909
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:910
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:181
 msgid "by"
 msgstr "przez"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:915
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:911
 msgid "in the %s format."
 msgstr "w formacie %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:928
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:924
 msgid "Sending email to"
 msgstr "Wysyłanie wiadomości do"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:958
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:965
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1057
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1118
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1236
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:954
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:962
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1054
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1235
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:1243
 msgid "No suitable formats"
 msgstr "Brak odpowiednich formatów"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:959
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:955
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 "Dokonać automatycznej konwersji następujących książek przed wysłaniem ich "
 "poprzez email?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:966
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:963
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 "Nie można było przesłać następujących książek poprzez email, ponieważ nie "
 "znaleziono odpowiednich formatów:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:984
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:981
 msgid "Failed to email books"
 msgstr "Przesłanie książek na email nie powiodło się"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:985
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:982
 msgid "Failed to email the following books:"
 msgstr "Przesłanie następujących książek poprzez email nie powiodło się:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:989
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:986
 msgid "Sent by email:"
 msgstr "Preślij poprzez email:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1016
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1013
 msgid "News:"
 msgstr "Aktualności:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1017
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1014
 msgid "Attached is the"
 msgstr "Załączony jest"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1028
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1025
 msgid "Sent news to"
 msgstr "Wysyłaj aktualności do"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1058
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1237
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1055
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1117
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1236
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 "Dokonać automatycznej konwersji następujących książek przed przesłaniem ich "
 "na urządzenie?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1087
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1085
 msgid "Sending catalogs to device."
 msgstr "Trwa wysyłanie katalogów do urządzenia"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1150
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1149
 msgid "Sending news to device."
 msgstr "Przesyłanie aktualności na urządzenie."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1202
 msgid "Sending books to device."
 msgstr "Wysyłanie książek do urządzenia."
 
@@ -4886,7 +4941,7 @@ msgid "My Books"
 msgstr "Moje książki"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:69
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:289
 msgid "Generate catalog"
 msgstr "Wygeneruj katalog"
 
@@ -5026,163 +5081,163 @@ msgstr "Szeroki"
 msgid "Narrow"
 msgstr "Wąski"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:503
 msgid "System port selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:503
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:504
 msgid ""
 "The value <b>%d</b> you have chosen for the content server port is a system "
 "port. Your operating system <b>may</b> not allow the server to run on this "
 "port. To be safe choose a port number larger than 1024."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:524
 msgid "Failed to install command line tools."
 msgstr "Nie powiodła się instalacja narzędzi linii poleceń."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:527
 msgid "Command line tools installed"
 msgstr "Narzędzia linii poleceń zostały zainstalowane"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:528
 msgid "Command line tools installed in"
 msgstr "Narzędzia linii poleceń zostały zainstalowane w"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:529
 msgid ""
 "If you move calibre.app, you have to re-install the command line tools."
 msgstr ""
 "Jeśli przeniesiesz calibre.app, będziesz musiał przeinstalować narzędzia "
 "linii poleceń."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:580
 msgid "No valid plugin path"
 msgstr "Niewłaściwa ścieżka do wtyczki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:581
 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/__init__.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:584
 msgid "Choose plugin"
 msgstr "Wybierz wtyczkę"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:596
 msgid "Plugin cannot be disabled"
 msgstr "Wtyczka nie może zostać wyłączona"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:597
 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/__init__.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:606
 msgid "Plugin not customizable"
 msgstr "Tej wtyczki nie można dostosowywać"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:607
 msgid "Plugin: %s does not need customization"
 msgstr "Wtyczka %s nie potrzebuje dodatkowego dostosowywania"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:615
 msgid "Customize"
 msgstr "Dostosuj"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:652
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:653
 msgid "Cannot remove builtin plugin"
 msgstr "Nie można usunąć wbudowanej wtyczki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:653
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:654
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 " - ta wtyczka nie może zostać usunięta. Ta wtyczka jest wbudowana w program. "
 "Zamiast tego spróbuj ją wyłączyć."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:684
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:685
 msgid "You must select a column to delete it"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:690
 msgid "The selected column is not a custom column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:690
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:691
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
 msgid "Are you sure?"
 msgstr "Na pewno?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:691
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:692
 msgid "Do you really want to delete column %s and all its data?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:758
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:759
 msgid "Error log:"
 msgstr "Dziennik błędów:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:765
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:766
 msgid "Access log:"
 msgstr "Dziennik dostępów:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:793
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:794
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:331
 msgid "Failed to start content server"
 msgstr "Włączanie serwera zakończone niepowodzeniem"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:817
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:818
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:587
 msgid "Select location for books"
 msgstr "Wybierz lokalizację dla książek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:824
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:825
 msgid "Invalid size"
 msgstr "Niewłaściwy rozmiar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:825
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:826
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr ""
 "Rozmiar %s jest nieprawidłowy. Musi on byc podany w fromacie "
 "wysokośćxszerokość"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:884
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:889
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:891
 msgid "Invalid database location"
 msgstr "Niewłaściwa lokalizacja bazy danych"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:885
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:887
 msgid "Invalid database location "
 msgstr "Niewłaściwa lokalizacja bazy danych "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:888
 msgid "<br>Must be a directory."
 msgstr "<br>Musi być katalogiem."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:890
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:892
 msgid "Invalid database location.<br>Cannot write to "
 msgstr "Niewłaściwa lokalizacja bazy danych.<br>Nie można zapisać do "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:895
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:897
 msgid "Must restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:896
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:898
 msgid ""
 "The changes you made require that Calibre be restarted. Please restart as "
 "soon as practical."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:930
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:932
 msgid "Checking database integrity"
 msgstr "Sprawdzanie integralności bazy danych"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:950
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:952
 msgid "Failed to check database integrity"
 msgstr "Sprawdzenie integralności bazy danych się nie powiodło"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:957
 msgid "Some inconsistencies found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:956
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:958
 msgid ""
 "The following books had formats listed in the database that are not actually "
 "available. The entries for the formats have been removed. You should check "
@@ -5190,22 +5245,22 @@ msgid ""
 "folder directly."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:133
 msgid "TabWidget"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:134
 msgid ""
 "Here you can control how calibre will read metadata from the files you add "
 "to it. calibre can either read metadata from the contents of the file, or "
 "from the filename."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:135
 msgid "Read metadata only from &file name"
 msgstr "Odczytaj metadane jedynie z &nazwy pliku"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:136
 msgid ""
 "Swap the firstname and lastname of the author. This affects only metadata "
 "read from file names."
@@ -5213,11 +5268,11 @@ msgstr ""
 "Zamień pozycjami imię i nazwisko autora. To ma wpływ jedynie na metadane "
 "odczytywane z nazw plików."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:137
 msgid "&Swap author firstname and lastname"
 msgstr "&Zamień pozycjami imię i nazwisko"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:138
 msgid ""
 "If an existing book with a similar title and author is found that does not "
 "have the format being added, the format is added\n"
@@ -5228,99 +5283,110 @@ msgid ""
 "punctuation, case, etc. Author match is exact."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:142
 msgid ""
 "If books with similar titles and authors found, &merge the new files "
 "automatically"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:143
 msgid "&Configure metadata from file name"
 msgstr "&Konfiguruj metadane pobierane z nazwy pliku"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:144
 msgid "&Adding books"
 msgstr "&Dodawanie książek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:145
 msgid ""
 "Here you can control how calibre will save your books when you click the "
 "Save to Disk button:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:146
 msgid "Save &cover separately"
 msgstr "Zapisuj &okładki osobno"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:147
 msgid "Update &metadata in saved copies"
 msgstr "Uaktualnij &metadane w zapisanych kopiach"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:148
 msgid "Save metadata in &OPF file"
 msgstr "Zapisz metadane w pliku &OPF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:149
 msgid "Convert non-English characters to &English equivalents"
 msgstr ""
 "Zamieniaj znaki nie w języku angielskiem na ich &angielskie odpowiedniki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:150
 msgid "Format &dates as:"
 msgstr "Formatuj &daty według schematu:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:151
 msgid "File &formats to save:"
 msgstr "&Formaty pliku do zapisu:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:152
 msgid "Replace space with &underscores"
 msgstr "Zastąp spacje &podkreślnikami"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:153
 msgid "Change paths to &lowercase"
 msgstr "Zmieniaj ścieżki na &małe litery"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:154
 msgid "&Saving books"
 msgstr "&Zapisywanie książek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:135
-msgid "Preserve device collections."
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:155
+msgid "Metadata &management:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:156
+msgid "Manual management"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:157
+msgid "Only on send"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:158
+msgid "Automatic management"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:159
 msgid ""
-"If checked, collections will not be deleted even if a book with changed "
-"metadata is resent and the collection is not in the book's metadata. In "
-"addition, editing collections in the device view will be enabled. If "
-"unchecked, collections will be always reflect only the metadata in the "
-"calibre library."
+"<li><b>Manual Management</b>: Calibre updates the metadata and adds "
+"collections only when a book is sent. With this option, calibre will never "
+"remove a collection.</li>\n"
+"<li><b>Only on send</b>: Calibre updates metadata and adds/removes "
+"collections for a book only when it is sent to the device. </li>\n"
+"<li><b>Automatic management</b>: Calibre automatically keeps metadata on the "
+"device in sync with the calibre library, on every connect</li></ul>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:137
-msgid "  "
-msgstr "  "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:162
 msgid ""
 "Here you can control how calibre will save your books when you click the "
 "Send to Device button. This setting can be overriden for individual devices "
 "by customizing the device interface plugins in Preferences->Plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:163
 msgid "Sending to &device"
 msgstr "Przesyłanie na &urządzenie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:167
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:174
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr "Preferencje"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
@@ -5328,212 +5394,216 @@ msgstr ""
 "&Lokalizacja książek (Książki są przechowywane w folderach posortowanych "
 "według autorów a metadane znajdują się w pliku metadata.db)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
 msgid "Browse for the new database location"
 msgstr "Wybierz nową lokalizację bazy danych"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
 msgid "Show notification when &new version is available"
 msgstr "Pokaż powiadomienie, gdy &nowa wersja jest dostępna"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
 msgid "Download &social metadata (tags/ratings/etc.) by default"
 msgstr "Pobieraj domyślnie metadane &społecznościowe (etykiety/oceny/itd.)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
 msgid "&Overwrite author and title by default when fetching metadata"
 msgstr "Domyślnie &nadpisuj autora i tytuł przy pobieraniu metadanych"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
 msgid "Default network &timeout:"
 msgstr "Domyślny sieciowy &czas oczekiwania:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
 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/config_ui.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
 msgid " seconds"
 msgstr " sekund"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
 msgid "Choose &language (requires restart):"
 msgstr "Wybierz &język (wymaga restartu):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
 msgid "Normal"
 msgstr "Normalny"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
 msgid "High"
 msgstr "Wysoki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
 msgid "Low"
 msgstr "Niski"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
 msgid "Job &priority:"
 msgstr "&Priorytet zdań:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
 msgid "Preferred &output format:"
 msgstr "Preferowany format &docelowy:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
 msgid "Preferred &input format order:"
 msgstr "Preferowany porządek formatów &źródłowych:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
 msgid "Use &Roman numerals for series number"
 msgstr "Używaj numeracji &rzymskiej do numerowania serii"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 "Aktywuj ikonę w &zasobniku systemowym (wymaga ponownego uruchomienia)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
 msgid "Show &notifications in system tray"
 msgstr "Pokaż &powiadomienia w zasobniku systemowym"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr "Pokaż &przeglądarkę okładek w nowym oknie (wymaga restartu)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
 msgid "Show &average ratings in the tags browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
 msgid "Search as you type"
 msgstr "Szukaj w trakcie wpisywania"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
 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/config_ui.py:578
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
 msgid "&Delete news from library when it is automatically sent to reader"
 msgstr ""
 "&Usuń wiadomości z biblioteki, gdy jest automatycznie wysyłane do czytnika"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 "&Liczba wyświetlanych okładek w trybie przeglądarki (wymaga restartu):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
 msgid "Toolbar"
 msgstr "Pasek narzędzi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
 msgid "Large"
 msgstr "Duże"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
 msgid "Medium"
 msgstr "Średnie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
 msgid "Small"
 msgstr "Małe"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
 msgid "&Button size in toolbar"
 msgstr "&Rozmiar przycisków na pasku narzędzi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
 msgid "Show &text in toolbar buttons"
 msgstr "Pokazuj &tekst pod przyciskami na pasku narzędzi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
 msgid "Select visible &columns in library view"
 msgstr "Wybierz &kolumny wyświetlane w widoku biblioteki:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
 msgid "Remove a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
 msgid "Add a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
 msgid "Edit settings of a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
 msgid "Use internal &viewer for:"
 msgstr "Użyj &wewnętrzej przeglądarki dla:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
 msgid "User Interface &layout (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
 msgid "Disable &animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
+msgid "Show &donate button (restart)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
 msgid "Add an email address to which to send books"
 msgstr "Dodaj adres email, na którego chcesz wysłać ksiązki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
 msgid "&Add email"
 msgstr "&Dodaj email"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
 msgid "Make &default"
 msgstr "&Ustaw jako domyślny"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
 msgid "&Remove email"
 msgstr "&Usuń email"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
 msgid ""
 "calibre can send your books to you (or your reader) by email. Emails will be "
 "automatically sent for downloaded news to all email addresses that have Auto-"
 "send checked."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
 msgid "&Maximum number of waiting worker processes (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
 msgid "&Check database integrity"
 msgstr "&Sprawdź integralność bazy danych"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
 msgid "&Install command line tools"
 msgstr "Za&instaluj narzędzia linii komend"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
 msgid "Open calibre &configuration directory"
 msgstr "Otwórz katalog &konfiguracyjny calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
 msgid "Limit the max. simultaneous jobs to the available CPU &cores"
 msgstr ""
 "Ogranicz liczbę jednocześnie wykonywanych zadań do ilości &rdzeni procesora"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
 msgid "Debug &device detection"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
 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 "
@@ -5543,25 +5613,25 @@ msgstr ""
 "pomocą przeglądarki z dowolnego miejsca na świecie. Jakiekolwiek zmiany w "
 "ustawieniach zostaną zatwierdzone po ponownym uruchomieniu serwera."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
 msgid "Server &port:"
 msgstr "&Port serwera"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:212
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:117
 msgid "&Username:"
 msgstr "Nazwa &użytkownika:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:213
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:119
 msgid "&Password:"
 msgstr "&Hasło:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
@@ -5569,51 +5639,51 @@ msgstr ""
 "Jeśli pozostawisz pole hasła puste, każdy będzie mógł uzyskać dostęp do "
 "twojej kolekcji książek przez interfejs internetowy."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
 msgid "Max. &cover size:"
 msgstr "Maks. rozmiar &okładki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:621
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:214
 msgid "&Show password"
 msgstr "&Pokaż hasło"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
 msgid "Max. &OPDS items per query:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
 msgid "Max. OPDS &ungrouped items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
 msgid "&Start Server"
 msgstr "&Włącz serwer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:621
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
 msgid "St&op Server"
 msgstr "W&yłącz serwer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:626
 msgid "&Test Server"
 msgstr "&Testuj serwer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
 msgid "Run server &automatically on startup"
 msgstr "Uruchom serwer &automatycznie przy starcie aplikacji"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:628
 msgid "View &server logs"
 msgstr "Pokaż dziennik &serwera"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:46
 msgid ""
 "<p>Remember to leave calibre running as the server only runs as long as "
@@ -5630,7 +5700,7 @@ msgstr ""
 "na urządzeniu iPhone. Oto myhostname powinny być w pełni kwalifikowaną nazwę "
 "hosta lub adres IP klasy komputer jest zasilany."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:631
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
@@ -5638,27 +5708,27 @@ msgstr ""
 "Tutaj można dostosować zachowanie Calibre poprzez kontrolę wtyczek, których "
 "ma używać."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:628
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:632
 msgid "Enable/&Disable plugin"
 msgstr "Włącz/&Wyłącz wtyczkę"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:633
 msgid "&Customize plugin"
 msgstr "&Dostosuj wtyczkę"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:630
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:634
 msgid "&Remove plugin"
 msgstr "&Usuń wtyczkę"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:635
 msgid "Add new plugin"
 msgstr "Dodaj nową wtyczkę"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:632
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:636
 msgid "Plugin &file:"
 msgstr "&Plik wtyczki:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:634
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:638
 msgid "&Add"
 msgstr "&Dodaj"
 
@@ -5696,9 +5766,9 @@ msgstr "Liczba"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:31
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:884
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:889
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Date"
 msgstr "Data"
@@ -5741,7 +5811,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:37
 msgid "Ratings, shown with stars"
-msgstr ""
+msgstr "Oceany pokazywane gwiazdkami"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:40
 msgid "Yes/No"
@@ -5890,12 +5960,18 @@ msgstr "&Zawsze pokazuj to ostrzeżenie"
 msgid "ERROR"
 msgstr "BŁĄD"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:67
+msgid ""
+"All checked books will be <b>permanently deleted</b> from your device. "
+"Please verify the list."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 msgid "Location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1058
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1064
 msgid "Format"
 msgstr "Format"
 
@@ -6728,6 +6804,10 @@ msgstr ""
 msgid "Add tag to available tags and apply it to current book"
 msgstr "Dodaj etykietę do dostępnych etykiet i przypisz ją do tej książki"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:20
+msgid "%s (was %s)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:501
 msgid "Item is blank"
@@ -7021,11 +7101,11 @@ msgstr "Wyrażenie regularne (?P&lt;title&gt;)"
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:88
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:93
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:98
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:100
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:99
 msgid "No match"
 msgstr "Brak wyników"
 
@@ -7065,43 +7145,43 @@ msgstr "Wyrażenie regularne (?P<isbn>)"
 msgid "Save single format to disk..."
 msgstr "Zapisz w pojedynczym formacie na dysku..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:53
 msgid "Edit metadata individually"
 msgstr "Edytuj metadane pojedynczo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:56
 msgid "Edit metadata in bulk"
 msgstr "Edytuj metadane masowo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:59
 msgid "Download metadata and covers"
 msgstr "Pobierz metadane i okładki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:62
 msgid "Download only metadata"
 msgstr "Pobierz tylko metadane"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:64
 msgid "Download only covers"
 msgstr "Pobierz tylko okładki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:67
 msgid "Download only social metadata"
 msgstr "Pobierz tylko metadane społecznościowe"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:73
 msgid "Merge into first selected book - delete others"
 msgstr "Połącz do pierwszej wybranej książki - pozostałe usuń"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:76
 msgid "Merge into first selected book - keep others"
 msgstr "Połącz do pierwszej wybranej książki - pozostałe pozostaw"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:84
 msgid "Add books from a single directory"
 msgstr "Dodaj książki z pojedyńczego folderu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:86
 msgid ""
 "Add books from directories, including sub-directories (One book per "
 "directory, assumes every ebook file is the same book in a different format)"
@@ -7109,7 +7189,7 @@ msgstr ""
 "Dodaj książki z folderów, włączając w to podfoldery (Jedna książka na "
 "folder, zakładając, że każdy plik jest tą samą książką w innym formacie)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:90
 msgid ""
 "Add books from directories, including sub directories (Multiple books per "
 "directory, assumes every ebook file is a different book)"
@@ -7117,98 +7197,116 @@ msgstr ""
 "Dodaj książki z folderów, włączając w to podfoldery (Wiele książek na "
 "folder, zakładając, że każdy plik jest inną książką)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:93
 msgid "Add Empty book. (Book entry with no formats)"
 msgstr "Dodaj pustą książkę (Wpis książki bez formatów)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:102
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:160
 msgid "Save to disk"
 msgstr "Zapisz na dysku"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Save to disk in a single directory"
 msgstr "Zapisz na dysku w pojedyńczym folderze"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:106
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:402
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:393
 msgid "Save only %s format to disk"
 msgstr "Zapisz na dysku jedynie pliki w formacie %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:110
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:396
 msgid "Save only %s format to disk in a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:119
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:166
 msgid "View"
 msgstr "Wyświetl"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:121
 msgid "View specific format"
 msgstr "Wyświetl określony format"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:127
 msgid "Remove selected books"
 msgstr "Usuń wybrane książki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:129
 msgid "Remove files of a specific format from selected books.."
 msgstr "Usuń pliki określonego formatu z wybranych książek..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:132
 msgid "Remove all formats from selected books, except..."
 msgstr "Usuń wszystkie formaty z wybranych książek oprócz..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:135
 msgid "Remove covers from selected books"
 msgstr "Usuń okładki z wybranych książek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:138
 msgid "Remove matching books from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:155
 msgid "Convert individually"
 msgstr "Konwertuj pojedynczo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:157
 msgid "Bulk convert"
 msgstr "Masowa konwersja"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:161
 msgid "Create catalog of books in your calibre library"
 msgstr "Stwórz katalog książek w Twojej bibliotece calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:169
 msgid "Run welcome wizard"
 msgstr "Uruchom kreator wstępnych ustawień"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:191
 msgid "Similar books..."
 msgstr "Podobne książki..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:223
 msgid "Add books to library"
-msgstr ""
+msgstr "Dodaj książki do biblioteki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:234
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:241
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:239
 msgid "Manage collections"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:328
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:319
 msgid "Cover Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:337
 msgid "Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:358
+msgid "version"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:359
+msgid "created by Kovid Goyal"
+msgstr "stworzone przez Kovid Goyal"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:377
+msgid "Connected "
+msgstr "Połączone "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:386
+msgid "Update found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:430
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:439
 msgid "Book Details"
 msgstr ""
 
@@ -7271,6 +7369,222 @@ msgstr "Kliknij, aby zobaczyć listę aktywnych zadań."
 msgid " - Jobs"
 msgstr " - Zadania"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:64
+msgid ""
+"Library\n"
+"%d books"
+msgstr ""
+"Biblioteka\n"
+"%d książek"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:65
+msgid ""
+"Reader\n"
+"%s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:66
+msgid ""
+"Card A\n"
+"%s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:67
+msgid ""
+"Card B\n"
+"%s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:71
+msgid "Click to see the books available on your computer"
+msgstr "Kliknij, aby zobaczyć książki dostępne na twoim komputerze"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:74
+msgid "Click to see the books in the main memory of your reader"
+msgstr "Kliknij, aby zobaczyć książki na głównej pamięci twojego czytnika"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:75
+msgid "Click to see the books on storage card A in your reader"
+msgstr "Kliknij, aby zobaczyć książki na karcie pamięci A w twoim czytniku"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:76
+msgid "Click to see the books on storage card B in your reader"
+msgstr "Kliknij, aby zobaczyć książki na karcie pamięci B w twoim czytniku"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:84
+msgid "Books located at"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:100
+msgid "free"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:134
+msgid ""
+"Books display will be restricted to those matching the selected saved search"
+msgstr ""
+"Wyświetlane książki będą zawężone do pozycji z wybranego zapisanego "
+"wyszukiwania"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:136
+msgid "Advanced search"
+msgstr "Zaawansowane wyszukiwanie"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:141
+msgid ""
+"<p>Search the list of books by title, author, publisher, tags, comments, "
+"etc.<br><br>Words separated by spaces are ANDed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:142
+msgid "Reset Quick Search"
+msgstr "Wyczyść pasek wyszukiwania"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:328
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:144
+msgid "Copy current search text (instead of search name)"
+msgstr "Skopiuj aktualny tekst wyszukiwania (zamiast nazwy wyszukiwania)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:146
+msgid "Save current search under the name shown in the box"
+msgstr "Zapisz aktualne wyszukiwanie pod nazwą pokazaną w polu"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:148
+msgid "Delete current saved search"
+msgstr "Usuń aktualne, zapisane wyszukiwanie."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:150
+msgid "Add books"
+msgstr "Dodaj książki"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:151
+msgid "A"
+msgstr "A"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:153
+msgid "Remove books"
+msgstr "Usuń książki"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:154
+msgid "Del"
+msgstr "Usuń"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:406
+msgid "Edit meta info"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:406
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:156
+msgid "E"
+msgstr "E"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:157
+msgid "Merge book records"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:158
+msgid "M"
+msgstr "S"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:159
+msgid "Send to device"
+msgstr "Prześlij na urządzenie"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:161
+msgid "S"
+msgstr "S"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:162
+msgid "Fetch news"
+msgstr "Pobierz aktualności"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:163
+msgid "F"
+msgstr "F"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:164
+msgid "Convert books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:165
+msgid "C"
+msgstr "C"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:167
+msgid "V"
+msgstr "V"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:168
+msgid "Open containing folder"
+msgstr "Otwórz folder zawierający"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:169
+msgid "Show book details"
+msgstr "Pokaż szczegóły ksiązki"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:170
+msgid "Books by same author"
+msgstr "Książki tego samego autora"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:171
+msgid "Books in this series"
+msgstr "Książki z tej serii"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:172
+msgid "Books by this publisher"
+msgstr "Książki tego samego wydawcy"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:173
+msgid "Books with the same tags"
+msgstr "Książki z takimi samymi etykietami"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:176
+msgid "Ctrl+P"
+msgstr "Ctrl+P"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:177
+msgid "Help"
+msgstr "Pomoc"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:178
+msgid "Browse the calibre User Manual"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:179
+msgid "F1"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:284
 msgid "N"
 msgstr ""
@@ -7292,39 +7606,39 @@ msgid "Rating"
 msgstr "Ocena"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:324
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1084
 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/models.py:674
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1176
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1182
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:886
 msgid "In Library"
-msgstr ""
+msgstr "W bibliotece"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:885
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:890
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1156
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1162
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1165
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr "Kliknij dwa razy, aby rozpocząć <b>edycję</b><br><br>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:110
 msgid "Hide column %s"
-msgstr ""
+msgstr "Ukryj kolumnę %s"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:115
 msgid "Sort on %s"
-msgstr ""
+msgstr "Posortuj po kolumnie %s"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:116
 msgid "Ascending"
@@ -7352,21 +7666,23 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:153
 msgid "Show column"
-msgstr ""
+msgstr "Pokaż kolumnę"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:165
 msgid "Restore default layout"
-msgstr ""
+msgstr "Przywróć domyślny układ"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:524
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:525
 msgid "Not allowed"
 msgstr "Niedozwolone"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:526
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
 msgstr ""
+"Przerzucanie bezpośrednio na urządzenie nie jest możliwe. Musisz najpierw "
+"dodać książkę do biblioteki calibre."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:47
 msgid "Configure Viewer"
@@ -7465,20 +7781,20 @@ msgstr "Biblioteka calibre"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:86
 msgid "Choose a location for your calibre e-book library"
-msgstr ""
+msgstr "Wybierz lokalizację dla twojej biblioteki książek calibre"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:95
 msgid "Failed to create library"
-msgstr ""
+msgstr "Stworzenie biblioteki nie powiodło się"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:96
 msgid "Failed to create calibre library at: %r."
-msgstr ""
+msgstr "Stworzenie biblioteki w %r nie powiodło się"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:184
 msgid "Choose a location for your new calibre e-book library"
-msgstr ""
+msgstr "Wybierz lokalizację dla twojej nowej biblioteki książek calibre"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:153
 msgid "Initializing user interface..."
@@ -7491,6 +7807,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:179
 msgid "The database repair failed. Starting with a new empty library."
 msgstr ""
+"Naprawa bazy danych nie powiodła się. Uruchamiam z nową, pustą biblioteką."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:193
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:226
@@ -7511,6 +7828,9 @@ msgid ""
 "and repair it automatically? If you say No, a new empty calibre library will "
 "be created."
 msgstr ""
+"Twoja baza danych calibre wygląda na uszkodzoną. Chcesz spróbować naprawić "
+"ją automatycznie? Jeśli wybierzesz Nie zostanie stworzona nowa, pusta "
+"biblioteka."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:214
 msgid ""
@@ -7521,6 +7841,7 @@ msgstr ""
 msgid ""
 "Bad database location %r. Will start with  a new, empty calibre library"
 msgstr ""
+"Błędna lokalizacja bazy danych: %r. Uruchamiam z nową, pustą biblioteką."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:238
 msgid "Starting %s: Loading books..."
@@ -7559,157 +7880,34 @@ msgstr "spróbuj zrestartować komputer."
 msgid "try deleting the file"
 msgstr "spróbuj usunąć plik"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:131
 msgid "calibre"
 msgstr "calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:133
 msgid "&Restrict to:"
-msgstr ""
+msgstr "&Zawęź do:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
-msgid ""
-"Books display will be restricted to those matching the selected saved search"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:135
 msgid "set in ui.py"
 msgstr "usraw w ui.py"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
-msgid "Advanced search"
-msgstr "Zaawansowane wyszukiwanie"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:138
 msgid "Alt+S"
 msgstr "Alt+S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:139
 msgid "&Search:"
 msgstr "&Szukaj:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
-msgid ""
-"<p>Search the list of books by title, author, publisher, tags, comments, "
-"etc.<br><br>Words separated by spaces are ANDed"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
-msgid "Reset Quick Search"
-msgstr "Wyczyść pasek wyszukiwania"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
-msgid "Choose saved search or enter name for new saved search"
-msgstr ""
-"Wybierz zapisane wyszukiwanie lub wpisz nazwę dla nowego wyszukiwania do "
-"zapisu"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
-msgid "Copy current search text (instead of search name)"
-msgstr "Skopiuj aktualny tekst wyszukiwania (zamiast nazwy wyszukiwania)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
-msgid "Save current search under the name shown in the box"
-msgstr "Zapisz aktualne wyszukiwanie pod nazwą pokazaną w polu"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
-msgid "Delete current saved search"
-msgstr "Usuń aktualne, zapisane wyszukiwanie."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
-msgid "Add books"
-msgstr "Dodaj książki"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
-msgid "A"
-msgstr "A"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
-msgid "Remove books"
-msgstr "Usuń książki"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
-msgid "Del"
-msgstr "Usuń"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:155
 msgid "Edit meta information"
 msgstr "Edytuj metadane"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
-msgid "E"
-msgstr "E"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
-msgid "Merge book records"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
-msgid "M"
-msgstr "S"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
-msgid "Send to device"
-msgstr "Prześlij na urządzenie"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
-msgid "S"
-msgstr "S"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
-msgid "Fetch news"
-msgstr "Pobierz aktualności"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
-msgid "F"
-msgstr "F"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
-msgid "Convert E-books"
-msgstr "Konwertuj ksiązki"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
-msgid "C"
-msgstr "C"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
-msgid "V"
-msgstr "V"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
-msgid "Open containing folder"
-msgstr "Otwórz folder zawierający"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
-msgid "Show book details"
-msgstr "Pokaż szczegóły ksiązki"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
-msgid "Books by same author"
-msgstr "Książki tego samego autora"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
-msgid "Books in this series"
-msgstr "Książki z tej serii"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
-msgid "Books by this publisher"
-msgstr "Książki tego samego wydawcy"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
-msgid "Books with the same tags"
-msgstr "Książki z takimi samymi etykietami"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:175
 msgid "Configure calibre"
 msgstr "Konfiguruj calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
-msgid "Ctrl+P"
-msgstr "Ctrl+P"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:20
 msgid ""
 "Redirect console output to a dialog window (both stdout and stderr). Useful "
@@ -7736,33 +7934,44 @@ msgstr "Książka nie ma, ani tytułu, ani kodu ISBN"
 msgid "No matches found for this book"
 msgstr "Nie znaleziono wyników dla tej książki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:91
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:553
 msgid "Search"
 msgstr "Szukaj"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:313
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:315
 msgid "The selected search will be <b>permanently deleted</b>. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:357
 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/search_box.py:392
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:398
 msgid "Saved Searches"
 msgstr "Zachowane wyszukiwania"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:406
+msgid "Choose saved search or enter name for new saved search"
+msgstr ""
+"Wybierz zapisane wyszukiwanie lub wpisz nazwę dla nowego wyszukiwania do "
+"zapisu"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:10
+msgid "Restrict to"
+msgstr "Zawęź do:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:48
 msgid "({0} of {1})"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
 msgid "(all books)"
 msgstr "(wszystkie książki)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:56
 msgid "({0} of all)"
 msgstr ""
 
@@ -7836,7 +8045,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:200
 msgid "Hide category %s"
-msgstr ""
+msgstr "Ukryj kategorię %s"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:203
 msgid "Show category"
@@ -7885,18 +8094,31 @@ msgstr ""
 msgid "Sort by average rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:775
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:772
+msgid "Set the sort order for entries in the Tag Browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:778
 msgid "Match all"
 msgstr "Dopasuj wszystkie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:775
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:778
 msgid "Match any"
 msgstr "Dopasuj którykolwiek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:783
+msgid ""
+"When selecting multiple entries in the Tag Browser match any or all of them"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:787
 msgid "Manage &user categories"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:790
+msgid "Add your own categories to the Tag Browser"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182
 msgid "Convert book %d of %d (%s)"
@@ -7924,15 +8146,15 @@ msgstr "Kolejkowanie książek do masowej konwersji"
 msgid "Queueing "
 msgstr "Kolejnkowanie "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:239
 msgid "Fetch news from "
 msgstr "Pobieranie aktualności z "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:301
 msgid "Convert existing"
 msgstr "Okładka istnieje"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:302
 msgid ""
 "The following books have already been converted to %s format. Do you wish to "
 "reconvert them?"
@@ -7948,55 +8170,45 @@ msgstr "&Przywróć"
 msgid "&Donate to support calibre"
 msgstr "&Wpłać i wesprzyj rozwój calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:168
 msgid "&Eject connected device"
 msgstr "&Odłącz połączone urządzenie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:173
 msgid "&Restart"
 msgstr "&Uruchom ponownie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:206
-msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
-msgstr ""
-"<p>Aby uzyskać pomoc otwórz: <a href=\"%s\">Podręcznik Uzytkownika</a><br>"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:212
-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/ui.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:227
 msgid "Calibre Quick Start Guide"
 msgstr "Krótki przewodnik po calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:389
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:380
 msgid "Cannot configure"
 msgstr "Nie można konfigurować"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:376
 msgid "Cannot configure while there are running jobs."
 msgstr "Nie można konfigurować programu, gdy są aktywne jakieś zadania."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:381
 msgid "Cannot configure before calibre is restarted."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:424
 msgid "No detailed info available"
 msgstr "Brak szczegółowych informacji"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:425
 msgid "No detailed information is available for books on the device."
 msgstr "Brak szczegółowych informacji dla książek na urządzeniu."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:486
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr "Błąd podczas konwersji"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:487
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:478
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using third party tools."
@@ -8005,26 +8217,27 @@ msgstr ""
 "href=\"%s\">DRM</a>. Musisz najpierw usunąć to zabezpieczenie przy pomocy "
 "innego programu."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:491
 msgid "Recipe Disabled"
 msgstr "Źródło wyłączone"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:506
 msgid "<b>Failed</b>"
 msgstr "<b>Nie powiodło się</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:546
 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."
+"you find it useful, please consider donating to support its development. "
+"Your donation helps keep calibre development going."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:572
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 "Niektóre zadania są aktywne. Jesteś pewnien, że chcesz zamknąć program?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:575
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
@@ -8034,11 +8247,11 @@ msgstr ""
 "                      Wyjście może spowodować uszkodzenie urządzenia.<br>\n"
 "                      Jesteś pewny, że chcesz wyjść?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:579
 msgid "WARNING: Active jobs"
 msgstr "OSTRZEŻENIE: Aktywne zadania"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:640
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:632
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -8046,19 +8259,11 @@ msgstr ""
 "będzie uruchomione w zasobniku systemowym. Aby je zamknąć, wybierz "
 "<b>Zakończ</b> z menu kontekstowego w zasobniku systemowym."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/update.py:52
-msgid ""
-"<span style=\"color:red; font-weight:bold\">Latest version: <a "
-"href=\"%s\">%s</a></span>"
-msgstr ""
-"<span style=\"color:red; font-weight:bold\">Najnowsza wersja: <a "
-"href=\"%s\">%s</a></span>"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/update.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:56
 msgid "Update available"
 msgstr "Uaktualnienia dostępne"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/update.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:57
 msgid ""
 "%s has been updated to version %s. See the <a href=\"http://calibre-"
 "ebook.com/whats-new\">new features</a>. Visit the download page?"
@@ -8532,105 +8737,45 @@ msgstr ""
 msgid "Print eBook"
 msgstr "Wydrukuj e-książkę"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
 msgid "Copy Image"
 msgstr "Kopiuj grafikę"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:240
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:239
 msgid "Paste Image"
 msgstr "Wklej grafikę"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:270
-msgid ""
-"Library\n"
-"%d\n"
-"books"
-msgstr ""
-"Biblioteka\n"
-"%d\n"
-"książek"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:271
-msgid ""
-"Reader\n"
-"%s\n"
-"available"
-msgstr ""
-"Czytnik\n"
-"%s\n"
-"dostępny"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:272
-msgid ""
-"Card A\n"
-"%s\n"
-"available"
-msgstr ""
-"Karta A\n"
-"%s\n"
-"dostępna"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:273
-msgid ""
-"Card B\n"
-"%s\n"
-"available"
-msgstr ""
-"Karta B\n"
-"%s\n"
-"dostępna"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:277
-msgid "Click to see the books available on your computer"
-msgstr "Kliknij, aby zobaczyć książki dostępne na twoim komputerze"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:280
-msgid "Click to see the books in the main memory of your reader"
-msgstr "Kliknij, aby zobaczyć książki na głównej pamięci twojego czytnika"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:281
-msgid "Click to see the books on storage card A in your reader"
-msgstr "Kliknij, aby zobaczyć książki na karcie pamięci A w twoim czytniku"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:282
-msgid "Click to see the books on storage card B in your reader"
-msgstr "Kliknij, aby zobaczyć książki na karcie pamięci B w twoim czytniku"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:290
-msgid "Books located at"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:364
 msgid "Change Case"
 msgstr "Zmień wielkość liter"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:365
 msgid "Upper Case"
 msgstr "Wielkie litery"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:366
 msgid "Lower Case"
 msgstr "Małe litery"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:367
 msgid "Swap Case"
 msgstr "Zamień wielkość liter"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:368
 msgid "Title Case"
 msgstr "Wielkość liter w tytule"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:974
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:837
 msgid "Drag to resize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:869
 msgid "Show"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1012
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:876
 msgid "Hide"
-msgstr ""
+msgstr "Ukryj"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:367
 msgid ""
@@ -8659,7 +8804,7 @@ msgstr "Przenoszenie biblioteki..."
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:466
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:467
 msgid "Failed to move library"
-msgstr "Przeniesienie biblioteki się nie powiodło"
+msgstr "Przeniesienie biblioteki nie powiodło się"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:521
 msgid "Invalid database"
@@ -9052,7 +9197,9 @@ msgstr ""
 msgid ""
 "Path to the calibre library. Default is to use the path stored in the "
 "settings."
-msgstr "Ś"
+msgstr ""
+"Ścieżka do biblioteki calibre. Domyślnie używana jest ścieżka zapisana w "
+"ustawieniach."
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:120
 msgid ""
@@ -9431,6 +9578,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:1770
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
+"<p>Przenoszenie starej bazy danych do biblioteki książek w %s<br><center>"
 
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:1799
 msgid "Copying <b>%s</b>"
@@ -9454,7 +9602,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:118
 msgid "Ratings"
-msgstr ""
+msgstr "Oceny"
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:24
 msgid "The title"
@@ -9609,6 +9757,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:31
 msgid "Set a password to restrict access. By default access is unrestricted."
 msgstr ""
+"Ustaw hasło aby ograniczyć dostęp. Domyślnie dostęp jest nieograniczony."
 
 #: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:33
 msgid "Username for access. By default, it is: %default"
@@ -9676,11 +9825,11 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:192
 msgid "Library"
-msgstr ""
+msgstr "Biblioteka"
 
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:231
 msgid "Books in your library"
-msgstr ""
+msgstr "Książki w twojej bibliotece"
 
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:237
 msgid "By "
@@ -9766,7 +9915,7 @@ msgid "User-created tag browser categories"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:702
-msgid "Preserve all collections even if not in library metadata."
+msgid "How and when calibre updates metadata on the device."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:43
@@ -9937,89 +10086,89 @@ msgstr "Nieznane źródło informacji"
 msgid "The \"%s\" recipe needs a username and password."
 msgstr "Źródło \"%s\" wymaga podania nazwy użytkownika i hasła."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:706
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:708
 msgid "Download finished"
 msgstr "Pobranie zakończone"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:708
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:710
 msgid "Failed to download the following articles:"
 msgstr "Nie udało się pobrać następujących artykułów:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:714
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:716
 msgid "Failed to download parts of the following articles:"
 msgstr "Nie udało się pobrać części następujących artykułów:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:716
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:718
 msgid " from "
 msgstr " z "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:718
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:720
 msgid "\tFailed links:"
 msgstr "\tNieprawidłowe linki:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:807
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:809
 msgid "Could not fetch article. Run with -vv to see the reason"
 msgstr "Nie udało się pobrać artykułu. Użyj -vv, by zobaczyć przyczynę"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:828
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:830
 msgid "Fetching feeds..."
 msgstr "Pobieram strumienie..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:833
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:835
 msgid "Got feeds from index page"
 msgstr "Pobierz strumienie ze strony głównej"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:839
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:841
 msgid "Trying to download cover..."
 msgstr "Próbuję pobrać okładkę..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:841
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:922
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:924
 msgid "Starting download [%d thread(s)]..."
 msgstr "Rozpoczynam pobieranie [%d wątek(ków)]..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:938
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:940
 msgid "Feeds downloaded to %s"
 msgstr "Strumienie pobrano do %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:948
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:950
 msgid "Could not download cover: %s"
 msgstr "Nie można pobrać okładki: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:960
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
 msgid "Downloading cover from %s"
 msgstr "Pobieranie okładki z %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1002
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1190
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1192
 msgid "Untitled Article"
 msgstr "Artykuł bez tytułu"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1261
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1263
 msgid "Article downloaded: %s"
 msgstr "Artykuł pobrany: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1272
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1274
 msgid "Article download failed: %s"
 msgstr "Pobieranie artykułu nie powiodło się: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1289
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1291
 msgid "Fetching feed"
 msgstr "Pobieram strumień"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1436
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1438
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1452
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1454
 msgid ""
 "You do not have permission to download this issue. Either your subscription "
 "has expired or you have exceeded the maximum allowed downloads for today."
@@ -10609,6 +10758,15 @@ msgstr "Nie pobieraj arkuszy styli CSS."
 #~ msgstr ""
 #~ "Liczba kolorów dla konwersji grafiki na czarno-białą. Domyślnie: %default"
 
+#~ msgid ""
+#~ "Library\n"
+#~ "%d\n"
+#~ "books"
+#~ msgstr ""
+#~ "Biblioteka\n"
+#~ "%d\n"
+#~ "książek"
+
 #~ msgid ""
 #~ "any2lrf [options] myfile\n"
 #~ "\n"
@@ -10651,6 +10809,10 @@ msgstr "Nie pobieraj arkuszy styli CSS."
 #~ "        \n"
 #~ "%prog konwertuje mój_e-book.epub do mój_e-book.lrf"
 
+#~ 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>"
+
 #~ msgid ""
 #~ "%s has been updated to version %s. See the <a "
 #~ "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">new features</a>. "
@@ -10981,9 +11143,36 @@ msgstr "Nie pobieraj arkuszy styli CSS."
 #~ msgid "Invalid library location"
 #~ msgstr "Niewłaściwa lokalizacja biblioteki"
 
+#~ msgid ""
+#~ "Card A\n"
+#~ "%s\n"
+#~ "available"
+#~ msgstr ""
+#~ "Karta A\n"
+#~ "%s\n"
+#~ "dostępna"
+
+#~ msgid ""
+#~ "Card B\n"
+#~ "%s\n"
+#~ "available"
+#~ msgstr ""
+#~ "Karta B\n"
+#~ "%s\n"
+#~ "dostępna"
+
 #~ msgid "Ebook Viewer"
 #~ msgstr "Przeglądarka książek"
 
+#~ msgid ""
+#~ "Reader\n"
+#~ "%s\n"
+#~ "available"
+#~ msgstr ""
+#~ "Czytnik\n"
+#~ "%s\n"
+#~ "dostępny"
+
 #~ msgid "English (IND)"
 #~ msgstr "angielski (Indie)"
 
@@ -11011,6 +11200,13 @@ msgstr "Nie pobieraj arkuszy styli CSS."
 #~ msgid "calibre can send your books to you (or your reader) by email"
 #~ msgstr "calibre może wysłać książki do Ciebie (lub czytelnika) przez e-mail"
 
+#~ msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
+#~ msgstr ""
+#~ "<p>Aby uzyskać pomoc otwórz: <a href=\"%s\">Podręcznik Uzytkownika</a><br>"
+
+#~ msgid "Convert E-books"
+#~ msgstr "Konwertuj ksiązki"
+
 #~ msgid "Communicate with the Sony PRS-600/700/900 eBook reader."
 #~ msgstr "Umożliwia komunikację z czytnikami książek Sony PRS-600/700/900."
 
@@ -11023,6 +11219,13 @@ msgstr "Nie pobieraj arkuszy styli CSS."
 #~ msgid "(%d found)"
 #~ msgstr "(znaleziono %d)"
 
+#~ msgid ""
+#~ "<span style=\"color:red; font-weight:bold\">Latest version: <a "
+#~ "href=\"%s\">%s</a></span>"
+#~ msgstr ""
+#~ "<span style=\"color:red; font-weight:bold\">Najnowsza wersja: <a "
+#~ "href=\"%s\">%s</a></span>"
+
 #~ msgid "&Transliterate unicode characters to ASCII."
 #~ msgstr "&Transliteruj znaki Unicode na ASCII."
 
@@ -11046,3 +11249,6 @@ msgstr "Nie pobieraj arkuszy styli CSS."
 
 #~ msgid "Communicate with iBooks through iTunes."
 #~ msgstr "Umożliwia komunikację z iBooks poprzez iTunes."
+
+#~ msgid "  "
+#~ msgstr "  "
diff --git a/src/calibre/translations/pt_BR.po b/src/calibre/translations/pt_BR.po
index f1e44313bb..11663dd3e8 100644
--- a/src/calibre/translations/pt_BR.po
+++ b/src/calibre/translations/pt_BR.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-07-03 01:21+0000\n"
-"PO-Revision-Date: 2010-07-02 18:27+0000\n"
+"POT-Creation-Date: 2010-07-09 22:00+0000\n"
+"PO-Revision-Date: 2010-07-09 20:30+0000\n"
 "Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: American English <kde-i18n-doc@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: 2010-07-03 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-07-10 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
@@ -27,10 +27,10 @@ msgstr "Não faz absolutamente nada"
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:71
 #: /home/kovid/work/calibre/src/calibre/devices/prs500/books.py:267
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:466
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:492
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:396
-#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:98
-#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:101
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:97
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:100
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/metadata.py:56
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:428
 #: /home/kovid/work/calibre/src/calibre/ebooks/fb2/input.py:67
@@ -72,9 +72,9 @@ msgstr "Não faz absolutamente nada"
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:818
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:49
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:51
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:910
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:915
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:981
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:911
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:916
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:982
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:137
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:139
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:108
@@ -102,20 +102,20 @@ msgstr "Não faz absolutamente nada"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:233
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:290
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:815
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:818
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:814
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:817
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:172
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:179
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:22
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:135
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:903
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:912
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1192
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1195
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:898
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:907
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1190
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1193
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:120
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:155
@@ -123,8 +123,8 @@ msgstr "Não faz absolutamente nada"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:172
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:362
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:877
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1054
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:882
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1060
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:87
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:92
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:185
@@ -170,7 +170,7 @@ msgstr "Escritor de metadados"
 msgid "Catalog generator"
 msgstr "Gerador de catálogo"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:15
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:16
 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 "
@@ -180,7 +180,7 @@ msgstr ""
 "contendo todos os arquivos ligados. Esse plugin é ativado sempre que você "
 "adiciona um arquivo HTML à sua biblioteca."
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:51
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:52
 msgid ""
 "Character encoding for the input HTML files. Common choices include: cp1252, "
 "latin1, iso-8859-1 and utf-8."
@@ -188,7 +188,7 @@ msgstr ""
 "Codificação de caracteres para os arquivos HTML de entrada. Escolhas comuns "
 "incluem: cp1252, latin1, iso-8859 e utf-8."
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:58
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:59
 msgid ""
 "Create a PMLZ archive containing the PML file and all images in the "
 "directory pmlname_img or images. This plugin is run every time you add a PML "
@@ -198,49 +198,49 @@ msgstr ""
 "'pmlname_img' ou 'images'. Esse plugin é ativado sempre que você adiciona um "
 "arquivo PML à sua biblioteca."
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:90
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:93
 msgid "Extract cover from comic files"
 msgstr "Extrair a capa dos arquivos de HQ"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:117
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:128
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:140
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:150
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:160
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:171
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:181
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:191
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:201
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:211
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:221
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:232
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:243
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:255
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:276
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:287
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:297
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:307
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:120
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:131
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:153
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:163
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:174
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:184
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:194
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:204
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:214
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:224
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:235
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:246
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:258
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:279
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:290
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:300
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:310
 msgid "Read metadata from %s files"
 msgstr "Ler metadados de %s arquivos"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:266
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:269
 msgid "Read metadata from ebooks in RAR archives"
 msgstr "Ler metadados dos ebooks em arquivos RAR"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:318
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:321
 msgid "Read metadata from ebooks in ZIP archives"
 msgstr "Ler metadados de ebooks em arquivos ZIP"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:331
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:341
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:351
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:373
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:384
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:394
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:334
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:344
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:354
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:376
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:387
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:397
 msgid "Set metadata in %s files"
 msgstr "Alterar metadados em %s arquivos"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:362
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:365
 msgid "Set metadata from %s files"
 msgstr "Alterar metadados a partir de %s arquivos"
 
@@ -398,35 +398,35 @@ msgstr ""
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr "Este perfil é destinado para o Kindle DX da Amazon."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:31
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
 msgid "Installed plugins"
 msgstr "Plug-ins instalados"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:33
 msgid "Mapping for filetype plugins"
 msgstr "Mapeamento para plugins de tipo de aquivo"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:33
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:34
 msgid "Local plugin customization"
 msgstr "Customização de plug-ins locais"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:34
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
 msgid "Disabled plugins"
 msgstr "Plug-ins desativados"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
 msgid "Enabled plugins"
 msgstr "Plug-ins habilitados"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:83
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:84
 msgid "No valid plugin found in "
 msgstr "Não foi encontrado um plugin válido em "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:460
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:468
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr "Inicialização do plugin %s falhou, gerando relatório:"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:493
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
 msgid ""
 "    %prog options\n"
 "\n"
@@ -438,18 +438,18 @@ msgstr ""
 "     customiza o calibre usando plugins externos\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:499
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr ""
 "Adiciona um plugin via a especificação do caminho de um arquivo zip que o "
 "contenha."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 "Remover um plugin personalizado por nome. Não tem efeito em plugins nativos"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:503
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:511
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
@@ -457,15 +457,15 @@ msgstr ""
 "Personalizar plugin. Use uma vírgula para separar o nome do plugin e a "
 "string de personalização."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:505
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:513
 msgid "List all installed plugins"
 msgstr "Listar todos os plugins instalados"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Enable the named plugin"
 msgstr "Habilitar a extensão com nome"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Disable the named plugin"
 msgstr "Desabilitar a extensão com nome"
 
@@ -623,7 +623,7 @@ msgstr "Comunica-se com leitores Hanlin V5."
 msgid "Communicate with the BOOX eBook reader."
 msgstr "Comunica-se com o leitor BOOX."
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:121
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:123
 msgid ""
 "Comma separated list of directories to send e-books to on the device. The "
 "first one that exists will be used."
@@ -696,7 +696,7 @@ msgstr "Comunica-se com o leitor Kobo."
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:51
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:54
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:57
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:157
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:159
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:64
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:67
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:70
@@ -706,22 +706,22 @@ msgstr "Comunica-se com o leitor Kobo."
 msgid "Getting list of books on device..."
 msgstr "Obtendo lista de livros no dispositivo..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:218
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:258
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:219
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:263
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:244
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:262
 msgid "Removing books from device..."
 msgstr "Removendo livros do dispositivo..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:262
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:269
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:267
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:274
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:269
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:274
 msgid "Removing books from device metadata listing..."
 msgstr "Removendo livros da lista de metadados do aparelho..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:274
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:308
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:313
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:208
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:238
 msgid "Adding books to device metadata listing..."
@@ -739,6 +739,10 @@ msgstr "Comunica-se com o Booq Avant"
 msgid "Communicate with the Sweex MM300"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/misc.py:75
+msgid "Communicate with the Pandigital Novel"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:17
 msgid "Communicate with the Nokia 770 internet tablet."
 msgstr "Comunica-se com o Nokia 770 Internet Tablet."
@@ -1660,6 +1664,51 @@ msgstr "Executando transformações no ebook..."
 msgid "Creating"
 msgstr "Criando"
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/__init__.py:18
+msgid "ePub Fixer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/epubcheck.py:18
+msgid "Workaround epubcheck bugs"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/epubcheck.py:22
+msgid ""
+"Workarounds for bugs in the latest release of epubcheck. epubcheck reports "
+"many things as errors that are not actually errors. %prog will try to detect "
+"these and replace them with constructs that epubcheck likes. This may cause "
+"significant changes to your epub, complain to the epubcheck project."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:19
+msgid ""
+"%prog [options] file.epub\n"
+"\n"
+"Fix common problems in EPUB files that can cause them to be rejected by "
+"poorly designed publishing services.\n"
+"\n"
+"By default, no fixing is done and messages are printed out for each error "
+"detected. Use the options to control which errors are automatically fixed."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:50
+msgid "You must specify an epub file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:17
+msgid "Fix unmanifested files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:21
+msgid ""
+"Fix unmanifested files. %prog can either add them to the manifest or delete "
+"them as specified by the delete unmanifested option."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:32
+msgid "Delete unmanifested files instead of adding them to the manifest"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:56
 msgid ""
 "Extract the contents of the generated EPUB file to the specified directory. "
@@ -2027,11 +2076,11 @@ msgstr "HQ"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:98
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:882
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:887
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:543
 msgid "Title"
 msgstr "Título"
@@ -2040,7 +2089,7 @@ msgstr "Título"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:364
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:883
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:888
 msgid "Author(s)"
 msgstr "Autor(es)"
 
@@ -2063,7 +2112,7 @@ msgstr "Produtor"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:67
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:318
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1073
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1079
 msgid "Comments"
 msgstr "Comentários"
 
@@ -2072,7 +2121,7 @@ msgstr "Comentários"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:306
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1069
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1075
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:139
 msgid "Tags"
 msgstr "Tags"
@@ -2082,7 +2131,7 @@ msgstr "Tags"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:323
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1084
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:87
 msgid "Series"
 msgstr "Série"
@@ -2092,7 +2141,7 @@ msgid "Language"
 msgstr "Idioma"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:406
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1067
 msgid "Timestamp"
 msgstr "Assinatura de tempo (timestamp)"
 
@@ -2346,7 +2395,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1226
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1398
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1399
 msgid "Cover"
 msgstr "Capas"
 
@@ -2388,70 +2437,70 @@ msgstr "Todos os artigos"
 msgid "This is an Amazon Topaz book. It cannot be processed."
 msgstr "Este é um livro Amazon Topaz. Ele não pode ser processado."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1399
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1400
 msgid "Title Page"
 msgstr "Página do Título"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1400
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1401
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:15
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:53
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:194
 msgid "Table of Contents"
 msgstr "Sumário"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1401
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1402
 msgid "Index"
 msgstr "Índice"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1402
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1403
 msgid "Glossary"
 msgstr "Glossário"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1403
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1404
 msgid "Acknowledgements"
 msgstr "Agradecimentos"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1404
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1405
 msgid "Bibliography"
 msgstr "Bibliografia"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1405
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1406
 msgid "Colophon"
 msgstr "Colofão"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1406
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1407
 msgid "Copyright"
 msgstr "Copyright"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1407
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1408
 msgid "Dedication"
 msgstr "Dedicatória"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1408
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1409
 msgid "Epigraph"
 msgstr "Epígrafe"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1409
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1410
 msgid "Foreword"
 msgstr "Prefácio"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1410
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1411
 msgid "List of Illustrations"
 msgstr "Lista de Ilustrações"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1411
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1412
 msgid "List of Tables"
 msgstr "Lista de Tabelas"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1412
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1413
 msgid "Notes"
 msgstr "Notas"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1413
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1414
 msgid "Preface"
 msgstr "Prefácio"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1414
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1415
 msgid "Main Text"
 msgstr "Texto Principal"
 
@@ -2495,7 +2544,7 @@ msgstr "Barra lateral"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:22
 #: /home/kovid/work/calibre/src/calibre/ebooks/tcr/input.py:23
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:23
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:24
 msgid ""
 "Normally calibre treats blank lines as paragraph markers. With this option "
 "it will assume that every line represents a paragraph instead."
@@ -2505,7 +2554,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:26
 #: /home/kovid/work/calibre/src/calibre/ebooks/tcr/input.py:27
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:27
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:28
 msgid ""
 "Normally calibre treats blank lines as paragraph markers. With this option "
 "it will assume that every line starting with an indent (either a tab or 2+ "
@@ -2645,7 +2694,7 @@ msgstr ""
 "Obter informações sobre um PDF.\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
 msgid "Author"
 msgstr "Autor"
@@ -2797,19 +2846,19 @@ msgid ""
 "slowest."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:33
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:34
 msgid ""
 "Normally extra spaces are condensed into a single space. With this option "
 "all spaces will be displayed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:36
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:37
 msgid ""
 "Run the text input through the markdown pre-processor. To learn more about "
 "markdown see"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:39
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:40
 msgid "Do not insert a Table of Contents into the output text."
 msgstr "Não insira um Sumário no texto de saída"
 
@@ -2981,7 +3030,7 @@ msgstr ""
 msgid "Copy to Clipboard"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:400
 msgid "Choose Files"
 msgstr ""
 
@@ -2996,13 +3045,13 @@ msgid "User annotations generated from main library only"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:75
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:612
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:671
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:708
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:729
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:877
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1060
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:670
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:707
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:728
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:876
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:941
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1059
 msgid "No books selected"
 msgstr "Nenhum livro selecionado"
 
@@ -3042,145 +3091,145 @@ msgstr "Quantos livros em branco?"
 msgid "How many empty books should be added?"
 msgstr "Quantos livros em branco devem ser adicionados?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:340
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:390
 msgid "Uploading books to device."
 msgstr "Enviando livros ao dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:350
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:137
 msgid "Books"
 msgstr "Livros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
 msgid "EPUB Books"
 msgstr "Livros EPUB"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
 msgid "LRF Books"
 msgstr "Livros LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
 msgid "HTML Books"
 msgstr "Livros HTML"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
 msgid "LIT Books"
 msgstr "Livros LIT"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
 msgid "MOBI Books"
 msgstr "Livros MOBI"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
 msgid "Topaz books"
 msgstr "Livros Topaz"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
 msgid "Text books"
 msgstr "Livros TXT"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:359
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
 msgid "PDF Books"
 msgstr "Livros PDF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:359
 msgid "Comics"
 msgstr "HQs"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:360
 msgid "Archives"
 msgstr "Arquivos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:364
 msgid "Supported books"
 msgstr "Livros suportados"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:399
 msgid "Merged some books"
 msgstr "Fundir alguns livros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:401
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:400
 msgid ""
 "Some duplicates were found and merged into the following existing books:"
 msgstr ""
 "Alguns livros duplicados foram encontrados e fundidos nos seguintes livros "
 "existentes:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:409
 msgid "Failed to read metadata"
 msgstr "Falhou na leitura dos metadados"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:410
 msgid "Failed to read metadata from the following"
 msgstr "Falhou na leitura dos metadados vindos de"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:434
 msgid "Add to library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:460
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1229
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:459
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1228
 msgid "No book selected"
 msgstr "Nenhum livro selecionado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:434
 msgid "No book files found"
 msgstr "Nenhum arquivo de livro encontrado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:456
 msgid "Cannot delete"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:469
 msgid "Choose formats to be deleted"
 msgstr "Escolha os formatos para serem apagados"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:488
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:487
 msgid "Choose formats <b>not</b> to be deleted"
 msgstr "Escolha os formatos para <b>não</b> serem apagados"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:507
 msgid "Cannot delete books"
 msgstr "Não foi possível apagar livros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:509
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:508
 msgid "No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:519
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:518
 msgid "Main memory"
 msgstr "Memória principal"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:519
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:444
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:453
 msgid "Storage Card A"
 msgstr "Cartão de Memória A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:521
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:520
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:446
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:455
 msgid "Storage Card B"
 msgstr "Cartão de Memória B"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:525
 msgid "No books to delete"
 msgstr "Nenhum livro para apagar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:526
 msgid "None of the selected books are on the device"
 msgstr "Nenhum dos livros selecionados estão no dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:544
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:600
 msgid "Deleting books from device."
 msgstr "Eliminar livros do dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:564
 msgid ""
 "The selected books will be <b>permanently deleted</b> and the files removed "
 "from your computer. Are you sure?"
@@ -3188,7 +3237,7 @@ msgstr ""
 "Os livros selecionados serão <b>permanentemente apagados</b> e os arquivos "
 "removidos de seu computador. Você tem certeza?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:585
 msgid ""
 "The selected books will be <b>permanently deleted</b> from your device. Are "
 "you sure?"
@@ -3196,61 +3245,61 @@ msgstr ""
 "Os livros selecionados serão <b>permanentemente apagados</b> de seu "
 "dispositivo. Você tem certeza?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:610
 msgid "Cannot download metadata"
 msgstr "Não foi possível obter metadados"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:627
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
 msgid "social metadata"
 msgstr "metadados sociais"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
 msgid "covers"
 msgstr "capas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
 msgid "metadata"
 msgstr "metadados"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:630
 msgid "Downloading %s for %d book(s)"
 msgstr "Baixando %s para %d livro(s)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:654
 msgid "Failed to download some metadata"
 msgstr "Falhou ao obter alguns metadados"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:656
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
 msgid "Failed to download metadata for the following:"
 msgstr "Falhou ao obter metadados para os seguintes:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:659
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:658
 msgid "Failed to download metadata:"
 msgstr "Falhou em obter metadados:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:660
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:659
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:637
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:522
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:949
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:951
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
 msgid "Error"
 msgstr "Erro"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:670
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:707
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:669
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:706
 msgid "Cannot edit metadata"
 msgstr "Não foi possível editar metadados"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:728
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:731
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:727
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:730
 msgid "Cannot merge books"
 msgstr "Não pode fundir livros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:732
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:731
 msgid "At least two books must be selected for merging"
 msgstr "Pelo menos dois livros devem ser selecionados para fusão"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:736
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:735
 msgid ""
 "All book formats and metadata from the selected books will be added to the "
 "<b>first selected book.</b><br><br> The second and subsequently selected "
@@ -3262,7 +3311,7 @@ msgstr ""
 "selecionados na seqüencia não serão removidos ou alterados.<br><br>Por "
 "favor, confirme se deseja proceder."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:747
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:746
 msgid ""
 "All book formats and metadata from the selected books will be merged into "
 "the <b>first selected book</b>.<br><br>After merger the second and "
@@ -3272,7 +3321,7 @@ msgid ""
 "from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:759
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:758
 msgid ""
 "You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
 "proceed?"
@@ -3280,45 +3329,45 @@ msgstr ""
 "Você está para fundir mais que 5 livros. Você tem <b>certeza</b> que você "
 "quer prosseguir?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:876
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:875
 msgid "Cannot save to disk"
 msgstr "Não foi possível salvar no disco"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:878
 msgid "Choose destination directory"
 msgstr "Escolher diretório de destino"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:912
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:911
 msgid "Error while saving"
 msgstr "Erro ao salvar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:913
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:912
 msgid "There was an error while saving."
 msgstr "Ocorreu um erro ao salvar."
 
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:919
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:920
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:921
 msgid "Could not save some books"
 msgstr "Não foi possível salvar alguns livros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:922
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:921
 msgid "Click the show details button to see which ones."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
 msgid "No books selected to generate catalog for"
 msgstr "Nenhum livro selecionado para gerar o catálogo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:960
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:959
 msgid "Generating %s catalog..."
 msgstr "Gerando %s catálogo..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:965
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:964
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:264
 msgid "No books found"
 msgstr "Não foram encontrados livros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:966
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:965
 msgid ""
 "No books to catalog\n"
 "Check exclude tags"
@@ -3326,49 +3375,49 @@ msgstr ""
 "Nenhum livro para catalogar\n"
 "Verifique as tags de exclusão"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:976
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:975
 msgid "Catalog generated."
 msgstr "Catálogo gerado."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:979
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:978
 msgid "Export Catalog Directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:980
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:979
 msgid "Select destination for %s.%s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:996
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:995
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1009
 msgid " fetched."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1059
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1058
 msgid "Cannot convert"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1088
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1087
 msgid "Starting conversion of %d book(s)"
 msgstr "Iniciando conversão de %d livro(s)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1265
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1264
 msgid "Cannot view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1209
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
 msgid "Choose the format to view"
 msgstr "Escolha o formato para visualizar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1218
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1217
 msgid "Multiple Books Selected"
 msgstr "Múltiplos Livros Selecionados"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1219
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1218
 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 "
@@ -3379,11 +3428,11 @@ msgstr ""
 "ser lento e deixar lento o se computador. Uma vez iniciado o processo ele "
 "não pode ser parado até ser concluído. Você deseja continuar?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1227
 msgid "Cannot open folder"
 msgstr "Não foi possível abrir o diretório"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1266
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1265
 msgid "%s has no available formats."
 msgstr "%s não tem formatos disponíveis."
 
@@ -3408,7 +3457,7 @@ msgid "The specified directory could not be processed."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:845
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:840
 msgid "No books"
 msgstr "Nenhum livro"
 
@@ -3532,15 +3581,15 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:52
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:633
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:637
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:366
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:371
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:385
@@ -3564,12 +3613,12 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:265
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:186
@@ -3599,8 +3648,9 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:313
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1059
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1065
 msgid "Path"
 msgstr "Caminho"
 
@@ -3617,8 +3667,8 @@ msgid "Formats"
 msgstr "Formatos"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:25
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:886
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1062
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:891
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1068
 msgid "Collections"
 msgstr ""
 
@@ -3631,12 +3681,12 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:305
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:311
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:317
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1068
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1072
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1074
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:458
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:467
 msgid "None"
 msgstr "Nenhum"
 
@@ -4715,11 +4765,11 @@ msgid ""
 "href=\"http://calibre-ebook.com/user_manual/xpath.html\">XPath Tutorial</a>."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:127
 msgid "Cover browser could not be loaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:179
 msgid "Browse by covers"
 msgstr "Navegar pelas capas"
 
@@ -4909,129 +4959,125 @@ msgstr "Dispositivo: "
 msgid " detected."
 msgstr " detectado."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:778
-msgid "Connected "
-msgstr "Conectado "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:846
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "selected to send"
 msgstr "selecionado para envio"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:851
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:846
 msgid "Choose format to send to device"
 msgstr "Escolha o formato para enviar ao dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:860
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:855
 msgid "No device"
 msgstr "Nenhum dispositivo disponível"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:856
 msgid "Cannot send: No device is connected"
 msgstr "Não foi possível enviar: o dispositivo está desconectado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:868
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:859
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:863
 msgid "No card"
 msgstr "Nenhum cartão disponível"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:869
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:860
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 "Não foi possível enviar: o dispositivo não possui um cartão de memória"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:910
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:905
 msgid "E-book:"
 msgstr "eBook:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:913
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:908
 msgid "Attached, you will find the e-book"
 msgstr "Você vai achar o eBook anexado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:909
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:181
 msgid "by"
 msgstr "por"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:915
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:910
 msgid "in the %s format."
 msgstr "no formato %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:928
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:923
 msgid "Sending email to"
 msgstr "Enviando e-mail para"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:958
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:965
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1057
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1118
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1236
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:953
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:961
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1053
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1115
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1234
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1242
 msgid "No suitable formats"
 msgstr "Nenhum formato apropriado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:959
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:954
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:966
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:962
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:984
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:980
 msgid "Failed to email books"
 msgstr "Falhou ao enviar livros por e-mail"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:985
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:981
 msgid "Failed to email the following books:"
 msgstr "Falha ao enviar por e-mail os seguintes livros:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:989
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:985
 msgid "Sent by email:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1016
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1012
 msgid "News:"
 msgstr "Notícias:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1017
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1013
 msgid "Attached is the"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1028
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1024
 msgid "Sent news to"
 msgstr "Enviar notícias para"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1058
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1237
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1054
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1235
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1087
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1084
 msgid "Sending catalogs to device."
 msgstr "Enviando catálogos ao dispositivo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1150
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1148
 msgid "Sending news to device."
 msgstr "Enviando notícias ao dispositivo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1201
 msgid "Sending books to device."
 msgstr "Enviando livros ao dispositivo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1244
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1243
 msgid ""
 "Could not upload the following books to the device, as no suitable formats "
 "were found. Convert the book(s) to a format supported by your device first."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1305
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1304
 msgid "No space on device"
 msgstr "Não há espaço no dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1306
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1305
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -5069,7 +5115,7 @@ msgid "My Books"
 msgstr "Meus Livros"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:69
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:289
 msgid "Generate catalog"
 msgstr "Gerar catálogo"
 
@@ -5211,11 +5257,11 @@ msgstr "Amplo"
 msgid "Narrow"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:503
 msgid "System port selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:503
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:504
 msgid ""
 "The value <b>%d</b> you have chosen for the content server port is a system "
 "port. Your operating system <b>may</b> not allow the server to run on this "
@@ -5226,147 +5272,147 @@ msgstr ""
 "permitir ao servidor ser executado nesta porta. Para não correr este risco "
 "utilize um número de porta maior que 1024."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:524
 msgid "Failed to install command line tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:527
 msgid "Command line tools installed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:528
 msgid "Command line tools installed in"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:529
 msgid ""
 "If you move calibre.app, you have to re-install the command line tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:580
 msgid "No valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:581
 msgid "%s is not a valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:584
 msgid "Choose plugin"
 msgstr "Escolher plugin"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:596
 msgid "Plugin cannot be disabled"
 msgstr "Este plugin não pode ser desativado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:597
 msgid "The plugin: %s cannot be disabled"
 msgstr "Não é possível desativar o plugin %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:606
 msgid "Plugin not customizable"
 msgstr "Plugin não configurável"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:607
 msgid "Plugin: %s does not need customization"
 msgstr "Não é necessário configurar o plugin %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:615
 msgid "Customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:652
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:653
 msgid "Cannot remove builtin plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:653
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:654
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:684
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:685
 msgid "You must select a column to delete it"
 msgstr "Você precisa selecionar um campo para poder deleta-lo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:690
 msgid "The selected column is not a custom column"
 msgstr "O campo selecionado não é um campo personalizado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:690
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:691
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
 msgid "Are you sure?"
 msgstr "Você tem certeza?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:691
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:692
 msgid "Do you really want to delete column %s and all its data?"
 msgstr "Você realmente deseja remover o campo %s e todos os seus dados?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:758
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:759
 msgid "Error log:"
 msgstr "Registro de erros:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:765
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:766
 msgid "Access log:"
 msgstr "Registro de acessos:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:793
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:794
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:332
 msgid "Failed to start content server"
 msgstr "Falhou ao iniciar o servidor de conteúdo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:817
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:818
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:587
 msgid "Select location for books"
 msgstr "Escolha a localização para os livros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:824
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:825
 msgid "Invalid size"
 msgstr "Tamanho inválido"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:825
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:826
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr "O tamanho %s é inválido. Precisa estar no formato larguraxaltura"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:884
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:889
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:891
 msgid "Invalid database location"
 msgstr "Localização do banco de dados inválida"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:885
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:887
 msgid "Invalid database location "
 msgstr "Localização do banco de dados inválida "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:888
 msgid "<br>Must be a directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:890
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:892
 msgid "Invalid database location.<br>Cannot write to "
 msgstr ""
 "Localização do banco de dados inválida.<br>Não foi possível escrever em "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:895
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:897
 msgid "Must restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:896
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:898
 msgid ""
 "The changes you made require that Calibre be restarted. Please restart as "
 "soon as practical."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:930
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:932
 msgid "Checking database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:950
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:952
 msgid "Failed to check database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:957
 msgid "Some inconsistencies found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:956
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:958
 msgid ""
 "The following books had formats listed in the database that are not actually "
 "available. The entries for the formats have been removed. You should check "
@@ -5502,14 +5548,14 @@ msgstr ""
 msgid "Sending to &device"
 msgstr "Enviando para o &dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:167
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr "Preferências"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
@@ -5517,178 +5563,182 @@ msgstr ""
 "&Localização dos eBooks (Os eBooks são armazenados em pastas ordenadas por "
 "autores e os metadados são armazenados no arquivo metadata.db)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
 msgid "Browse for the new database location"
 msgstr "Escolha a nova localização do banco de dados"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
 msgid "Show notification when &new version is available"
 msgstr "Mostrar notificação quando uma &nova versão estiver disponível"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
 msgid "Download &social metadata (tags/ratings/etc.) by default"
 msgstr "Obter metadados &sociais (rótulos/avaliações/etc.) por padrão"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
 msgid "&Overwrite author and title by default when fetching metadata"
 msgstr "S&obrescrever autor e título por padrão quando obter metadados"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
 msgid "Default network &timeout:"
 msgstr "&tempo padrão para expirar a rede:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
 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/config_ui.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
 msgid " seconds"
 msgstr " segundos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
 msgid "Choose &language (requires restart):"
 msgstr "Selecionar &idioma (requer reinicialização):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
 msgid "Normal"
 msgstr "Normal"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
 msgid "High"
 msgstr "Alta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
 msgid "Low"
 msgstr "Baixa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
 msgid "Job &priority:"
 msgstr "&prioridade do trabalho:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
 msgid "Preferred &output format:"
 msgstr "F&ormato de Saída Preferido:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
 msgid "Preferred &input format order:"
 msgstr "ordem preferida dos formatos de &entrada:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
 msgid "Use &Roman numerals for series number"
 msgstr "Use numerais &Romanos para números da série"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
 msgid "Enable system &tray icon (needs restart)"
 msgstr "Habilitar ícone na bandeja do sis&tema (requer reinicialização)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
 msgid "Show &notifications in system tray"
 msgstr "Mostrar &notificações na bandeja do sistema"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
 msgid "Show &average ratings in the tags browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
 msgid "Search as you type"
 msgstr "Pesquisa na medida que você digita"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr "Automaticamente enviar &notícias baixadas para o leitor de ebook"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
 msgid "&Delete news from library when it is automatically sent to reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 "&Números de capas para mostrar no modo navegador (precisa reiniciar):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
 msgid "Toolbar"
 msgstr "Barra de ferramentas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
 msgid "Large"
 msgstr "Grande"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
 msgid "Medium"
 msgstr "Médio"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
 msgid "Small"
 msgstr "Pequeno"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
 msgid "&Button size in toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
 msgid "Show &text in toolbar buttons"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
 msgid "Select visible &columns in library view"
 msgstr "Selecione os &campos que ficarão visíveis na exibição da biblioteca"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
 msgid "Remove a user-defined column"
 msgstr "Remove um campo personalizado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
 msgid "Add a user-defined column"
 msgstr "Adiciona um campo personalizado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
 msgid "Edit settings of a user-defined column"
 msgstr "Altera as configurações de um campo personalizado"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
 msgid "Use internal &viewer for:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
 msgid "User Interface &layout (needs restart):"
 msgstr "&layout da Interface do Usuário (precisa reiniciar):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
 msgid "Disable &animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
+msgid "Show &donate button (restart)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
 msgid "Add an email address to which to send books"
 msgstr "Adicionar um endereço de email para enviar livros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
 msgid "&Add email"
 msgstr "&Adicionar e-mail"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
 msgid "Make &default"
 msgstr "Tornar &padrão"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
 msgid "&Remove email"
 msgstr "&Remover e-mail"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
 msgid ""
 "calibre can send your books to you (or your reader) by email. Emails will be "
 "automatically sent for downloaded news to all email addresses that have Auto-"
@@ -5698,31 +5748,31 @@ msgstr ""
 "das notícias baixadas serão automaticamente enviados para todos os endereços "
 "de email que foram marcados como Auto-envio."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
 msgid "&Maximum number of waiting worker processes (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
 msgid "&Check database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
 msgid "&Install command line tools"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
 msgid "Open calibre &configuration directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
 msgid "Limit the max. simultaneous jobs to the available CPU &cores"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
 msgid "Debug &device detection"
 msgstr "Depurar a detecção de &dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
 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 "
@@ -5732,75 +5782,75 @@ msgstr ""
 "de livros usando um navegador de qualquer lugar no mundo. Qualquer mudança "
 "as configurações somente fará efeito depois de reiniciar o servidor."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
 msgid "Server &port:"
 msgstr "&porta do servidor:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:212
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:117
 msgid "&Username:"
 msgstr "Nome de &usuário:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:213
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:119
 msgid "&Password:"
 msgstr "&Senha:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
 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/config_ui.py:615
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
 msgid "Max. &cover size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:621
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:214
 msgid "&Show password"
 msgstr "&Exibir senha"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
 msgid "Max. &OPDS items per query:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
 msgid "Max. OPDS &ungrouped items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
 msgid "&Start Server"
 msgstr "&Iniciar servidor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:621
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
 msgid "St&op Server"
 msgstr "&Interr&omper servidor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:626
 msgid "&Test Server"
 msgstr "&Testar servidor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
 msgid "Run server &automatically on startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:628
 msgid "View &server logs"
 msgstr "Ver &registros do servidor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:46
 msgid ""
 "<p>Remember to leave calibre running as the server only runs as long as "
@@ -5811,33 +5861,33 @@ msgid ""
 "the IP address of the computer calibre is running on."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:631
 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/config_ui.py:628
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:632
 msgid "Enable/&Disable plugin"
 msgstr "Ativar/&Desativar plugin"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:633
 msgid "&Customize plugin"
 msgstr "&Configurar plugin"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:630
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:634
 msgid "&Remove plugin"
 msgstr "&Remover plugin"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:635
 msgid "Add new plugin"
 msgstr "Instalar novo plugin"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:632
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:636
 msgid "Plugin &file:"
 msgstr "&Arquivo de plugin:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:634
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:638
 msgid "&Add"
 msgstr "&Adicionar"
 
@@ -5875,9 +5925,9 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:31
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:884
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:889
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Date"
 msgstr "Data"
@@ -6083,12 +6133,18 @@ msgstr "&Exibir este aviso novamente"
 msgid "ERROR"
 msgstr "ERRO"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:67
+msgid ""
+"All checked books will be <b>permanently deleted</b> from your device. "
+"Please verify the list."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 msgid "Location"
 msgstr "Localização"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1058
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1064
 msgid "Format"
 msgstr "Formato"
 
@@ -6913,6 +6969,10 @@ msgstr ""
 msgid "Add tag to available tags and apply it to current book"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:20
+msgid "%s (was %s)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:501
 msgid "Item is blank"
@@ -7273,43 +7333,43 @@ msgstr ""
 msgid "Save single format to disk..."
 msgstr "Salvar em um único formato para o disco..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:53
 msgid "Edit metadata individually"
 msgstr "Editar metadados individualmente"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:56
 msgid "Edit metadata in bulk"
 msgstr "Editar metadados em lote"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:59
 msgid "Download metadata and covers"
 msgstr "Obter metadados e capas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:62
 msgid "Download only metadata"
 msgstr "Obter apenas os metadados"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:64
 msgid "Download only covers"
 msgstr "Baixar apenas as capas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:67
 msgid "Download only social metadata"
 msgstr "Obter somente os metadados sociais"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:73
 msgid "Merge into first selected book - delete others"
 msgstr "Fundir no primeiro livro selecionado - apagar os outros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:76
 msgid "Merge into first selected book - keep others"
 msgstr "Fundir no primeiro livro selecionado - manter os outros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:84
 msgid "Add books from a single directory"
 msgstr "Adicionar livros de um diretório"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:86
 msgid ""
 "Add books from directories, including sub-directories (One book per "
 "directory, assumes every ebook file is the same book in a different format)"
@@ -7318,7 +7378,7 @@ msgstr ""
 "diretório, assumindo que cada arquivo é o mesmo livro em um formato "
 "diferente)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:90
 msgid ""
 "Add books from directories, including sub directories (Multiple books per "
 "directory, assumes every ebook file is a different book)"
@@ -7326,98 +7386,114 @@ msgstr ""
 "Adicionar livros de diretórios, incluindo subdiretórios (vários livros por "
 "diretório, assumindo que cada arquivo é um livro diferente)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:93
 msgid "Add Empty book. (Book entry with no formats)"
 msgstr "Adicionar livro vazio. (Entrada de livro sem nenhum formato)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:102
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
 msgid "Save to disk"
 msgstr "Salvar no disco"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Save to disk in a single directory"
 msgstr "Salvar no disco em um único diretório"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:106
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:402
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:394
 msgid "Save only %s format to disk"
 msgstr "Salvar somente os formatos %s para o disco"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:110
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:397
 msgid "Save only %s format to disk in a single directory"
 msgstr "Salvar somente os formatos %s para o disco em um único diretório"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:119
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
 msgid "View"
 msgstr "Exibir"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:121
 msgid "View specific format"
 msgstr "Exibir formato específico"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:127
 msgid "Remove selected books"
 msgstr "Remover livros selecionados"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:129
 msgid "Remove files of a specific format from selected books.."
 msgstr "Remove arquivos de um formato específico dos livros selecionados..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:132
 msgid "Remove all formats from selected books, except..."
 msgstr "Remove todos os formatos dos livros selecionados, exceto..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:135
 msgid "Remove covers from selected books"
 msgstr "Remove capas dos livros selecionados"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:138
 msgid "Remove matching books from device"
 msgstr "Remove livros correspondentes do dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:155
 msgid "Convert individually"
 msgstr "Converter individualmente"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:157
 msgid "Bulk convert"
 msgstr "Conversão em massa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:161
 msgid "Create catalog of books in your calibre library"
 msgstr "Criar um catálogo de livros em sua biblioteca do calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:169
 msgid "Run welcome wizard"
 msgstr "Rodar o assistente de boas vindas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:205
 msgid "Similar books..."
 msgstr "Livros similares..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:237
 msgid "Add books to library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:234
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:241
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:253
 msgid "Manage collections"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:328
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:333
 msgid "Cover Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:351
 msgid "Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:372
+msgid "version"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:373
+msgid "created by Kovid Goyal"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:391
+msgid "Connected "
+msgstr "Conectado "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:400
+msgid "Update found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:454
 msgid "Book Details"
 msgstr ""
 
@@ -7501,29 +7577,29 @@ msgid "Rating"
 msgstr "Avaliação"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:324
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1084
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:674
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1176
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1182
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
 msgid "The lookup/search name is \"{0}\""
 msgstr "O nome para a pesquisa é \"{0}\""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:886
 msgid "In Library"
 msgstr "Na Biblioteca"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:885
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:890
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1156
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1162
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1165
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr ""
 
@@ -7567,11 +7643,11 @@ msgstr "Mostrar campo"
 msgid "Restore default layout"
 msgstr "Restaurar o layout padrão"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:524
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:525
 msgid "Not allowed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:526
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
@@ -7774,158 +7850,165 @@ msgstr "tente reiniciando o seu computador"
 msgid "try deleting the file"
 msgstr "tente eliminando o arquivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:247
 msgid "calibre"
 msgstr "calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:249
 msgid "&Restrict to:"
 msgstr "&Restringir à:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:250
 msgid ""
 "Books display will be restricted to those matching the selected saved search"
 msgstr ""
 "Livros mostrados serão restritos aos que correspondem a pesquisa salva "
 "selecionada"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:251
 msgid "set in ui.py"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:252
 msgid "Advanced search"
 msgstr "Pesquisa avançada"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
 msgid "Alt+S"
 msgstr "Alt+S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
 msgid "&Search:"
 msgstr "&Procurar:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
 msgid ""
 "<p>Search the list of books by title, author, publisher, tags, comments, "
 "etc.<br><br>Words separated by spaces are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
 msgid "Reset Quick Search"
 msgstr "Limpar Pesquisa Rápida"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
-msgid "Choose saved search or enter name for new saved search"
-msgstr ""
-"Escolha uma pesquisa salva ou entre um nome para uma nova pesquisa salva"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
 msgid "Copy current search text (instead of search name)"
 msgstr "Copia o texto da pesquisa atual (ao invés do nome da pesquisa)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
 msgid "Save current search under the name shown in the box"
 msgstr "Salva a pesquisa atual com o nome mostrado na caixa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
 msgid "Delete current saved search"
 msgstr "Apaga a pesquisa atual salva"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
 msgid "Add books"
 msgstr "Adicionar livros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
 msgid "A"
 msgstr "A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
 msgid "Remove books"
 msgstr "Remover livros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
 msgid "Del"
 msgstr "Apagar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
 msgid "Edit meta information"
 msgstr "Editar informação meta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
 msgid "E"
 msgstr "E"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
 msgid "Merge book records"
 msgstr "Fusão de livros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
 msgid "M"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
 msgid "Send to device"
 msgstr "Enviar para o dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
 msgid "S"
 msgstr "S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
 msgid "Fetch news"
 msgstr "Obter notícias"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
 msgid "Convert E-books"
 msgstr "Converter eBooks"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
 msgid "C"
 msgstr "C"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
 msgid "V"
 msgstr "V"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
 msgid "Open containing folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
 msgid "Show book details"
 msgstr "Exibir detalhes do livro"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
 msgid "Books by same author"
 msgstr "Livros do mesmo autor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
 msgid "Books in this series"
 msgstr "Livros nesta série"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
 msgid "Books by this publisher"
 msgstr "Livros deste editor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
 msgid "Books with the same tags"
 msgstr "Livros com as mesmas tags"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
 msgid "Configure calibre"
 msgstr "Configurar calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
 msgid "Ctrl+P"
 msgstr "Ctrl+P"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
+msgid "Help"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
+msgid "Browse the calibre User Manual"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
+msgid "F1"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:20
 msgid ""
 "Redirect console output to a dialog window (both stdout and stderr). Useful "
@@ -7954,33 +8037,38 @@ msgstr "O livro não possui nem título nem ISBN"
 msgid "No matches found for this book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:91
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:262
 msgid "Search"
 msgstr "Pesquisar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:313
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:315
 msgid "The selected search will be <b>permanently deleted</b>. Are you sure?"
 msgstr ""
 "A pesquisa selecionada será <b>permanentemente apagada</b>. Você tem certeza?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:357
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr "Pesquisar (Para Pesquisa Avançada clique no botão da esquerda)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:392
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:398
 msgid "Saved Searches"
 msgstr "Pesquisas Salvas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:406
+msgid "Choose saved search or enter name for new saved search"
+msgstr ""
+"Escolha uma pesquisa salva ou entre um nome para uma nova pesquisa salva"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:47
 msgid "({0} of {1})"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:53
 msgid "(all books)"
 msgstr "(todos os livros)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:55
 msgid "({0} of all)"
 msgstr ""
 
@@ -8103,18 +8191,31 @@ msgstr "Ordenar pela popularidade"
 msgid "Sort by average rating"
 msgstr "Ordernar pela média de avaliações"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:775
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:772
+msgid "Set the sort order for entries in the Tag Browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:778
 msgid "Match all"
 msgstr "Todos os critérios"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:775
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:778
 msgid "Match any"
 msgstr "Qualquer critério"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:783
+msgid ""
+"When selecting multiple entries in the Tag Browser match any or all of them"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:787
 msgid "Manage &user categories"
 msgstr "Gerenciar categorias do &usuário"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:790
+msgid "Add your own categories to the Tag Browser"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182
 msgid "Convert book %d of %d (%s)"
@@ -8142,15 +8243,15 @@ msgstr ""
 msgid "Queueing "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:239
 msgid "Fetch news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:301
 msgid "Convert existing"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:302
 msgid ""
 "The following books have already been converted to %s format. Do you wish to "
 "reconvert them?"
@@ -8164,80 +8265,70 @@ msgstr "&Restaurar"
 msgid "&Donate to support calibre"
 msgstr "Faça uma &doação para contribuir com calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:168
 msgid "&Eject connected device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:173
 msgid "&Restart"
 msgstr "&Reiniciar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:206
-msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
-msgstr "<p>Para ajuda veja o: <a href=\"%s\">Manual do Usuário</a><br>"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:212
-msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:227
 msgid "Calibre Quick Start Guide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:389
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:381
 msgid "Cannot configure"
 msgstr "Não foi possível configurar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:377
 msgid "Cannot configure while there are running jobs."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:382
 msgid "Cannot configure before calibre is restarted."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:425
 msgid "No detailed info available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:426
 msgid "No detailed information is available for books on the device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:486
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:478
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:506
 msgid "Conversion Error"
 msgstr "Erro ao converter"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:487
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:479
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using third party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:492
 msgid "Recipe Disabled"
 msgstr "Lista Desativada"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:507
 msgid "<b>Failed</b>"
 msgstr "<b>Falha</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:547
 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."
+"you find it useful, please consider donating to support its development. "
+"Your donation helps keep calibre development going."
 msgstr ""
-"é o resultado dos esforços de muitos voluntários de todas as partes do "
-"mundo. Se você o achar útil, por favor considere a possibilidade de doar "
-"para sustentar o seu desenvolvimento."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:573
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr "Existem tarefas ativas. Você tem certeza que deseja sair?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:576
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
@@ -8247,11 +8338,11 @@ msgstr ""
 "                      Sair agora pode corremper dados no dispositivo.<br>\n"
 "                      Você tem certeza que deseja sair?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:640
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:633
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -8259,17 +8350,11 @@ msgstr ""
 "continua executando na bandeja do sistema. Para encerrar, selecione "
 "<b>Sair</b> no menu de contexto."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/update.py:52
-msgid ""
-"<span style=\"color:red; font-weight:bold\">Latest version: <a "
-"href=\"%s\">%s</a></span>"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/update.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:56
 msgid "Update available"
 msgstr "Atualização disponível"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/update.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:57
 msgid ""
 "%s has been updated to version %s. See the <a href=\"http://calibre-"
 "ebook.com/whats-new\">new features</a>. Visit the download page?"
@@ -8756,32 +8841,25 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:270
 msgid ""
 "Library\n"
-"%d\n"
-"books"
+"%d books"
 msgstr ""
-"Biblioteca\n"
-"%d\n"
-"Livros"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:271
 msgid ""
 "Reader\n"
-"%s\n"
-"available"
+"%s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:272
 msgid ""
 "Card A\n"
-"%s\n"
-"available"
+"%s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:273
 msgid ""
 "Card B\n"
-"%s\n"
-"available"
+"%s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:277
@@ -8807,35 +8885,39 @@ msgstr ""
 msgid "Books located at"
 msgstr "Livros localizados em"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:306
+msgid "free"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:557
 msgid "Change Case"
 msgstr "Mudar caixa do texto"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:558
 msgid "Upper Case"
 msgstr "TODAS MAIÚSCULAS"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:559
 msgid "Lower Case"
 msgstr "todas minúsculas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:560
 msgid "Swap Case"
 msgstr "iNVERTER maiúsculas e MINÚSCULAS"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:561
 msgid "Title Case"
 msgstr "Todas As Palavras, Primeira Letra Maiúscula (Título)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:974
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:983
 msgid "Drag to resize"
 msgstr "Arraste para redimensionar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1015
 msgid "Show"
 msgstr "Mostrar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1012
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1022
 msgid "Hide"
 msgstr "Esconder"
 
@@ -10224,83 +10306,83 @@ msgstr "Fonte de notícias desconhecida"
 msgid "The \"%s\" recipe needs a username and password."
 msgstr "A lista \"%s\" requer um usuário e senha."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:706
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:708
 msgid "Download finished"
 msgstr "Download concluído"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:708
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:710
 msgid "Failed to download the following articles:"
 msgstr "Falha ao baixar os seguintes artigos:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:714
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:716
 msgid "Failed to download parts of the following articles:"
 msgstr "Falha ao baixar partes do artigos a seguir:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:716
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:718
 msgid " from "
 msgstr " de "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:718
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:720
 msgid "\tFailed links:"
 msgstr "\tLinks que falharam:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:807
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:809
 msgid "Could not fetch article. Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:828
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:830
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:833
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:835
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:839
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:841
 msgid "Trying to download cover..."
 msgstr "Tentando obter capa..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:841
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:922
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:924
 msgid "Starting download [%d thread(s)]..."
 msgstr "Iniciando o download [%d tarefa(s)]"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:938
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:940
 msgid "Feeds downloaded to %s"
 msgstr "Feeds descarregados para %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:948
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:950
 msgid "Could not download cover: %s"
 msgstr "Não foi possível baixar capa: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:960
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
 msgid "Downloading cover from %s"
 msgstr "Baixando capa de %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1002
 msgid "Masthead image downloaded"
 msgstr "Imagem de cabeçalho baixada"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1190
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1192
 msgid "Untitled Article"
 msgstr "Artigo sem título"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1261
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1263
 msgid "Article downloaded: %s"
 msgstr "Artigo transferido: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1272
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1274
 msgid "Article download failed: %s"
 msgstr "Transferência de artigo falhou: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1289
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1291
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1436
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1438
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
@@ -10308,7 +10390,7 @@ msgstr ""
 "Falou em logar-se, verifique seu nome de usuário e senha para o serviço de "
 "Periódicos do calibre."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1452
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1454
 msgid ""
 "You do not have permission to download this issue. Either your subscription "
 "has expired or you have exceeded the maximum allowed downloads for today."
@@ -10556,6 +10638,9 @@ msgstr "Não baixar folhas de estilo CSS."
 #~ "em um dispositivo que não suporta SVG, como o iPhone ou o JetBook Lite. Sem "
 #~ "esta opção, os dispositivos irão mostrar a capa como uma página em branco."
 
+#~ msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
+#~ msgstr "<p>Para ajuda veja o: <a href=\"%s\">Manual do Usuário</a><br>"
+
 #~ msgid "Sort by &popularity"
 #~ msgstr "Classificar por &popularidade"
 
@@ -10565,5 +10650,22 @@ msgstr "Não baixar folhas de estilo CSS."
 #~ msgid "Failed to create calibre library at: %r. Aborting."
 #~ msgstr "Falhou em criar biblioteca do calibre em: %r. Abortando."
 
+#~ msgid ""
+#~ "Library\n"
+#~ "%d\n"
+#~ "books"
+#~ msgstr ""
+#~ "Biblioteca\n"
+#~ "%d\n"
+#~ "Livros"
+
 #~ msgid "Disconnect from folder"
 #~ msgstr "Desconectar do diretório"
+
+#~ 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 ""
+#~ "é o resultado dos esforços de muitos voluntários de todas as partes do "
+#~ "mundo. Se você o achar útil, por favor considere a possibilidade de doar "
+#~ "para sustentar o seu desenvolvimento."
diff --git a/src/calibre/translations/ro.po b/src/calibre/translations/ro.po
index 7ecbcc7fd7..ed70d9625b 100644
--- a/src/calibre/translations/ro.po
+++ b/src/calibre/translations/ro.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-07-03 01:21+0000\n"
-"PO-Revision-Date: 2010-07-03 13:39+0000\n"
-"Last-Translator: drjors <Unknown>\n"
+"POT-Creation-Date: 2010-07-09 22:00+0000\n"
+"PO-Revision-Date: 2010-07-09 20:09+0000\n"
+"Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Romanian <ro@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: 2010-07-04 03:44+0000\n"
+"X-Launchpad-Export-Date: 2010-07-10 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
@@ -27,10 +27,10 @@ msgstr "Nu face absolut nimic"
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:71
 #: /home/kovid/work/calibre/src/calibre/devices/prs500/books.py:267
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:466
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:492
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:396
-#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:98
-#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:101
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:97
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:100
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/metadata.py:56
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:428
 #: /home/kovid/work/calibre/src/calibre/ebooks/fb2/input.py:67
@@ -72,9 +72,9 @@ msgstr "Nu face absolut nimic"
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:818
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:49
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:51
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:910
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:915
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:981
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:911
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:916
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:982
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:137
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:139
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:108
@@ -102,20 +102,20 @@ msgstr "Nu face absolut nimic"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:233
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:290
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:815
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:818
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:814
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:817
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:172
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:179
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:22
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:135
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:903
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:912
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1192
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1195
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:898
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:907
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1190
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1193
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:120
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:155
@@ -123,8 +123,8 @@ msgstr "Nu face absolut nimic"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:172
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:362
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:877
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1054
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:882
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1060
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:87
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:92
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:185
@@ -170,7 +170,7 @@ msgstr "Scriitor de meta-date"
 msgid "Catalog generator"
 msgstr "Generator de catalog"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:15
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:16
 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 "
@@ -180,7 +180,7 @@ msgstr ""
 "care conţine toate fişierele legate. Acest plugin este rulat ori de câte ori "
 "adăugaţi un fişier HTML în bibliotecă."
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:51
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:52
 msgid ""
 "Character encoding for the input HTML files. Common choices include: cp1252, "
 "latin1, iso-8859-1 and utf-8."
@@ -188,7 +188,7 @@ msgstr ""
 "Codificarea caracterelor in fisierele HTML sursa. Cele mai utilizate "
 "optiuni: cp1252, latin1, iso-8859-1 si utf-8."
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:58
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:59
 msgid ""
 "Create a PMLZ archive containing the PML file and all images in the "
 "directory pmlname_img or images. This plugin is run every time you add a PML "
@@ -198,49 +198,49 @@ msgstr ""
 "directorul pmlname_img sau images. Acest plugin ruleaza de fiecare data cand "
 "se adauga un nou fisier PML in librarie."
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:90
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:93
 msgid "Extract cover from comic files"
 msgstr "Extrage coperta din fişierele album"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:117
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:128
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:140
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:150
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:160
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:171
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:181
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:191
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:201
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:211
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:221
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:232
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:243
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:255
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:276
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:287
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:297
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:307
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:120
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:131
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:153
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:163
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:174
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:184
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:194
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:204
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:214
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:224
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:235
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:246
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:258
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:279
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:290
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:300
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:310
 msgid "Read metadata from %s files"
 msgstr "Citeşte meta-date din fişierele %s"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:266
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:269
 msgid "Read metadata from ebooks in RAR archives"
 msgstr "Citeşte meta-date din e-cărţi în arhive RAR"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:318
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:321
 msgid "Read metadata from ebooks in ZIP archives"
 msgstr "Citeşte meta-date din e-cărţi în arhive ZIP"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:331
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:341
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:351
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:373
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:384
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:394
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:334
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:344
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:354
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:376
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:387
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:397
 msgid "Set metadata in %s files"
 msgstr "Setează meta-date în fişiere %s"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:362
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:365
 msgid "Set metadata from %s files"
 msgstr "Setează meta-date din fişiere %s"
 
@@ -397,35 +397,35 @@ msgstr ""
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr "Acest profil este destinat pentru Amazon Kindle DX."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:31
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
 msgid "Installed plugins"
 msgstr "Module instalate"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:33
 msgid "Mapping for filetype plugins"
 msgstr "Mapari pentru module de fisiere"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:33
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:34
 msgid "Local plugin customization"
 msgstr "Personalizarea locala a plugin-urilor"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:34
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
 msgid "Disabled plugins"
 msgstr "Module dezactivate"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
 msgid "Enabled plugins"
 msgstr "Module activate"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:83
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:84
 msgid "No valid plugin found in "
 msgstr "Nu a fost găsit niciun modul valid în "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:460
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:468
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr "Initializarea plugin-ului %s esuata cu mesajul:"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:493
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
 msgid ""
 "    %prog options\n"
 "\n"
@@ -437,18 +437,18 @@ msgstr ""
 "    Personalizeaza Calibre prin folosirea plugin-urilor externe.\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:499
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr ""
 "Adaugă un plugin prin specificarea căii către fişierul zip ce îl conţine."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 "Înlătură un plugin particular specificat prin nume. Nu are efect asupra "
 "plugin-urilor încastrate"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:503
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:511
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
@@ -456,15 +456,15 @@ msgstr ""
 "Personalizeaza un plugin. Specifica numele plugin-ului si sirul personalizat "
 "separate prin virgula."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:505
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:513
 msgid "List all installed plugins"
 msgstr "Listează toate plugin-urile instalate"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Enable the named plugin"
 msgstr "Activează plugin-ul specificat prin nume"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Disable the named plugin"
 msgstr "Dezactivează plugin-ul specificat prin nume"
 
@@ -622,7 +622,7 @@ msgstr "Comunica cu Hanlin V5."
 msgid "Communicate with the BOOX eBook reader."
 msgstr "Comunica cu BOOX."
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:121
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:123
 msgid ""
 "Comma separated list of directories to send e-books to on the device. The "
 "first one that exists will be used."
@@ -695,7 +695,7 @@ msgstr "Comunica cu Kobo Reader"
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:51
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:54
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:57
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:157
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:159
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:64
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:67
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:70
@@ -705,22 +705,22 @@ msgstr "Comunica cu Kobo Reader"
 msgid "Getting list of books on device..."
 msgstr "Obtine lista cartilor din dispozitiv"
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:218
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:258
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:219
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:263
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:244
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:262
 msgid "Removing books from device..."
 msgstr "Sterge carti din dispozitiv..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:262
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:269
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:267
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:274
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:269
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:274
 msgid "Removing books from device metadata listing..."
 msgstr "Sterg carti din lista metadata a dispozitivului..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:274
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:308
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:313
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:208
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:238
 msgid "Adding books to device metadata listing..."
@@ -738,6 +738,10 @@ msgstr "Comunica cu Booq Avant"
 msgid "Communicate with the Sweex MM300"
 msgstr "Comunica cu Sweex MM300"
 
+#: /home/kovid/work/calibre/src/calibre/devices/misc.py:75
+msgid "Communicate with the Pandigital Novel"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:17
 msgid "Communicate with the Nokia 770 internet tablet."
 msgstr "Comunica cu Nokia 770"
@@ -1539,6 +1543,51 @@ msgstr ""
 msgid "Creating"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/__init__.py:18
+msgid "ePub Fixer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/epubcheck.py:18
+msgid "Workaround epubcheck bugs"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/epubcheck.py:22
+msgid ""
+"Workarounds for bugs in the latest release of epubcheck. epubcheck reports "
+"many things as errors that are not actually errors. %prog will try to detect "
+"these and replace them with constructs that epubcheck likes. This may cause "
+"significant changes to your epub, complain to the epubcheck project."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:19
+msgid ""
+"%prog [options] file.epub\n"
+"\n"
+"Fix common problems in EPUB files that can cause them to be rejected by "
+"poorly designed publishing services.\n"
+"\n"
+"By default, no fixing is done and messages are printed out for each error "
+"detected. Use the options to control which errors are automatically fixed."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:50
+msgid "You must specify an epub file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:17
+msgid "Fix unmanifested files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:21
+msgid ""
+"Fix unmanifested files. %prog can either add them to the manifest or delete "
+"them as specified by the delete unmanifested option."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:32
+msgid "Delete unmanifested files instead of adding them to the manifest"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:56
 msgid ""
 "Extract the contents of the generated EPUB file to the specified directory. "
@@ -1854,11 +1903,11 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:98
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:882
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:887
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:543
 msgid "Title"
 msgstr ""
@@ -1867,7 +1916,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:364
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:883
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:888
 msgid "Author(s)"
 msgstr ""
 
@@ -1890,7 +1939,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:67
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:318
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1073
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1079
 msgid "Comments"
 msgstr ""
 
@@ -1899,7 +1948,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:306
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1069
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1075
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:139
 msgid "Tags"
 msgstr ""
@@ -1909,7 +1958,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:323
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1084
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:87
 msgid "Series"
 msgstr ""
@@ -1919,7 +1968,7 @@ msgid "Language"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:406
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1067
 msgid "Timestamp"
 msgstr ""
 
@@ -2144,7 +2193,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1226
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1398
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1399
 msgid "Cover"
 msgstr ""
 
@@ -2183,70 +2232,70 @@ msgstr ""
 msgid "This is an Amazon Topaz book. It cannot be processed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1399
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1400
 msgid "Title Page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1400
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1401
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:15
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:53
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:194
 msgid "Table of Contents"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1401
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1402
 msgid "Index"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1402
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1403
 msgid "Glossary"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1403
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1404
 msgid "Acknowledgements"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1404
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1405
 msgid "Bibliography"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1405
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1406
 msgid "Colophon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1406
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1407
 msgid "Copyright"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1407
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1408
 msgid "Dedication"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1408
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1409
 msgid "Epigraph"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1409
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1410
 msgid "Foreword"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1410
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1411
 msgid "List of Illustrations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1411
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1412
 msgid "List of Tables"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1412
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1413
 msgid "Notes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1413
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1414
 msgid "Preface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1414
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1415
 msgid "Main Text"
 msgstr ""
 
@@ -2290,7 +2339,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:22
 #: /home/kovid/work/calibre/src/calibre/ebooks/tcr/input.py:23
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:23
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:24
 msgid ""
 "Normally calibre treats blank lines as paragraph markers. With this option "
 "it will assume that every line represents a paragraph instead."
@@ -2298,7 +2347,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:26
 #: /home/kovid/work/calibre/src/calibre/ebooks/tcr/input.py:27
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:27
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:28
 msgid ""
 "Normally calibre treats blank lines as paragraph markers. With this option "
 "it will assume that every line starting with an indent (either a tab or 2+ "
@@ -2427,7 +2476,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
 msgid "Author"
 msgstr ""
@@ -2562,19 +2611,19 @@ msgid ""
 "slowest."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:33
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:34
 msgid ""
 "Normally extra spaces are condensed into a single space. With this option "
 "all spaces will be displayed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:36
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:37
 msgid ""
 "Run the text input through the markdown pre-processor. To learn more about "
 "markdown see"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:39
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:40
 msgid "Do not insert a Table of Contents into the output text."
 msgstr ""
 
@@ -2736,7 +2785,7 @@ msgstr ""
 msgid "Copy to Clipboard"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:400
 msgid "Choose Files"
 msgstr ""
 
@@ -2751,13 +2800,13 @@ msgid "User annotations generated from main library only"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:75
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:612
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:671
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:708
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:729
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:877
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1060
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:670
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:707
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:728
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:876
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:941
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1059
 msgid "No books selected"
 msgstr ""
 
@@ -2797,209 +2846,209 @@ msgstr ""
 msgid "How many empty books should be added?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:340
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:390
 msgid "Uploading books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:350
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:137
 msgid "Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
 msgid "EPUB Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
 msgid "LRF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
 msgid "HTML Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
 msgid "LIT Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
 msgid "MOBI Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
 msgid "Topaz books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
 msgid "Text books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:359
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
 msgid "PDF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:359
 msgid "Comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:360
 msgid "Archives"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:364
 msgid "Supported books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:399
 msgid "Merged some books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:401
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:400
 msgid ""
 "Some duplicates were found and merged into the following existing books:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:409
 msgid "Failed to read metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:410
 msgid "Failed to read metadata from the following"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:434
 msgid "Add to library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:460
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1229
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:459
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1228
 msgid "No book selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:434
 msgid "No book files found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:456
 msgid "Cannot delete"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:469
 msgid "Choose formats to be deleted"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:488
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:487
 msgid "Choose formats <b>not</b> to be deleted"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:507
 msgid "Cannot delete books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:509
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:508
 msgid "No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:519
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:518
 msgid "Main memory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:519
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:444
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:453
 msgid "Storage Card A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:521
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:520
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:446
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:455
 msgid "Storage Card B"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:525
 msgid "No books to delete"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:526
 msgid "None of the selected books are on the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:544
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:600
 msgid "Deleting books from device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:564
 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/actions.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:585
 msgid ""
 "The selected books will be <b>permanently deleted</b> from your device. Are "
 "you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:610
 msgid "Cannot download metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:627
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
 msgid "social metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
 msgid "covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
 msgid "metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:630
 msgid "Downloading %s for %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:654
 msgid "Failed to download some metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:656
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
 msgid "Failed to download metadata for the following:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:659
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:658
 msgid "Failed to download metadata:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:660
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:659
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:637
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:522
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:949
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:951
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
 msgid "Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:670
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:707
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:669
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:706
 msgid "Cannot edit metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:728
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:731
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:727
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:730
 msgid "Cannot merge books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:732
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:731
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:736
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:735
 msgid ""
 "All book formats and metadata from the selected books will be added to the "
 "<b>first selected book.</b><br><br> The second and subsequently selected "
@@ -3007,7 +3056,7 @@ msgid ""
 "proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:747
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:746
 msgid ""
 "All book formats and metadata from the selected books will be merged into "
 "the <b>first selected book</b>.<br><br>After merger the second and "
@@ -3017,99 +3066,99 @@ msgid ""
 "from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:759
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:758
 msgid ""
 "You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
 "proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:876
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:875
 msgid "Cannot save to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:878
 msgid "Choose destination directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:912
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:911
 msgid "Error while saving"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:913
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:912
 msgid "There was an error while saving."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:919
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:920
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:921
 msgid "Could not save some books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:922
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:921
 msgid "Click the show details button to see which ones."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
 msgid "No books selected to generate catalog for"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:960
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:959
 msgid "Generating %s catalog..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:965
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:964
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:264
 msgid "No books found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:966
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:965
 msgid ""
 "No books to catalog\n"
 "Check exclude tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:976
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:975
 msgid "Catalog generated."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:979
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:978
 msgid "Export Catalog Directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:980
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:979
 msgid "Select destination for %s.%s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:996
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:995
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1009
 msgid " fetched."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1059
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1058
 msgid "Cannot convert"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1088
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1087
 msgid "Starting conversion of %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1265
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1264
 msgid "Cannot view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1209
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
 msgid "Choose the format to view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1218
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1217
 msgid "Multiple Books Selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1219
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1218
 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 "
@@ -3117,11 +3166,11 @@ msgid ""
 "continue?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1227
 msgid "Cannot open folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1266
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1265
 msgid "%s has no available formats."
 msgstr ""
 
@@ -3146,7 +3195,7 @@ msgid "The specified directory could not be processed."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:845
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:840
 msgid "No books"
 msgstr ""
 
@@ -3270,15 +3319,15 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:52
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:633
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:637
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:366
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:371
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:385
@@ -3302,12 +3351,12 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:265
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:186
@@ -3337,8 +3386,9 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:313
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1059
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1065
 msgid "Path"
 msgstr ""
 
@@ -3355,8 +3405,8 @@ msgid "Formats"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:25
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:886
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1062
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:891
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1068
 msgid "Collections"
 msgstr ""
 
@@ -3369,12 +3419,12 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:305
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:311
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:317
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1068
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1072
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1074
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:458
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:467
 msgid "None"
 msgstr ""
 
@@ -4433,11 +4483,11 @@ msgid ""
 "href=\"http://calibre-ebook.com/user_manual/xpath.html\">XPath Tutorial</a>."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:127
 msgid "Cover browser could not be loaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:179
 msgid "Browse by covers"
 msgstr ""
 
@@ -4627,128 +4677,124 @@ msgstr ""
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:778
-msgid "Connected "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:846
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:851
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:846
 msgid "Choose format to send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:860
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:855
 msgid "No device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:856
 msgid "Cannot send: No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:868
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:859
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:863
 msgid "No card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:869
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:860
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:910
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:905
 msgid "E-book:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:913
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:908
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:909
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:181
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:915
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:910
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:928
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:923
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:958
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:965
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1057
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1118
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1236
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:953
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:961
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1053
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1115
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1234
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1242
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:959
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:954
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:966
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:962
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:984
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:980
 msgid "Failed to email books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:985
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:981
 msgid "Failed to email the following books:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:989
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:985
 msgid "Sent by email:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1016
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1012
 msgid "News:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1017
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1013
 msgid "Attached is the"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1028
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1024
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1058
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1237
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1054
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1235
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1087
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1084
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1150
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1148
 msgid "Sending news to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1201
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1244
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1243
 msgid ""
 "Could not upload the following books to the device, as no suitable formats "
 "were found. Convert the book(s) to a format supported by your device first."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1305
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1304
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1306
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1305
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -4786,7 +4832,7 @@ msgid "My Books"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:69
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:289
 msgid "Generate catalog"
 msgstr ""
 
@@ -4919,157 +4965,157 @@ msgstr ""
 msgid "Narrow"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:503
 msgid "System port selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:503
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:504
 msgid ""
 "The value <b>%d</b> you have chosen for the content server port is a system "
 "port. Your operating system <b>may</b> not allow the server to run on this "
 "port. To be safe choose a port number larger than 1024."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:524
 msgid "Failed to install command line tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:527
 msgid "Command line tools installed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:528
 msgid "Command line tools installed in"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:529
 msgid ""
 "If you move calibre.app, you have to re-install the command line tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:580
 msgid "No valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:581
 msgid "%s is not a valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:584
 msgid "Choose plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:596
 msgid "Plugin cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:597
 msgid "The plugin: %s cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:606
 msgid "Plugin not customizable"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:607
 msgid "Plugin: %s does not need customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:615
 msgid "Customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:652
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:653
 msgid "Cannot remove builtin plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:653
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:654
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:684
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:685
 msgid "You must select a column to delete it"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:690
 msgid "The selected column is not a custom column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:690
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:691
 #: /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/config/__init__.py:691
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:692
 msgid "Do you really want to delete column %s and all its data?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:758
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:759
 msgid "Error log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:765
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:766
 msgid "Access log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:793
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:794
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:332
 msgid "Failed to start content server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:817
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:818
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:587
 msgid "Select location for books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:824
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:825
 msgid "Invalid size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:825
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:826
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:884
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:889
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:891
 msgid "Invalid database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:885
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:887
 msgid "Invalid database location "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:888
 msgid "<br>Must be a directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:890
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:892
 msgid "Invalid database location.<br>Cannot write to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:895
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:897
 msgid "Must restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:896
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:898
 msgid ""
 "The changes you made require that Calibre be restarted. Please restart as "
 "soon as practical."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:930
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:932
 msgid "Checking database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:950
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:952
 msgid "Failed to check database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:957
 msgid "Some inconsistencies found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:956
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:958
 msgid ""
 "The following books had formats listed in the database that are not actually "
 "available. The entries for the formats have been removed. You should check "
@@ -5197,296 +5243,300 @@ msgstr ""
 msgid "Sending to &device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:167
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
 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/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
 msgid "Browse for the new database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
 msgid "Show notification when &new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
 msgid "Download &social metadata (tags/ratings/etc.) by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
 msgid "&Overwrite author and title by default when fetching metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
 msgid "Default network &timeout:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
 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/config_ui.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
 msgid " seconds"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
 msgid "Normal"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
 msgid "High"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
 msgid "Low"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
 msgid "Job &priority:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
 msgid "Preferred &output format:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
 msgid "Preferred &input format order:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
 msgid "Use &Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
 msgid "Show &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
 msgid "Show &average ratings in the tags browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
 msgid "Search as you type"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
 msgid "&Delete news from library when it is automatically sent to reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
 msgid "Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
 msgid "Small"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
 msgid "&Button size in toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
 msgid "Show &text in toolbar buttons"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
 msgid "Select visible &columns in library view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
 msgid "Remove a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
 msgid "Add a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
 msgid "Edit settings of a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
 msgid "Use internal &viewer for:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
 msgid "User Interface &layout (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
 msgid "Disable &animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
-msgid "Add an email address to which to send books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
-msgid "&Add email"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
-msgid "Make &default"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
-msgid "&Remove email"
+msgid "Show &donate button (restart)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
+msgid "Add an email address to which to send books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
+msgid "&Add email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
+msgid "Make &default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
+msgid "&Remove email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
 msgid ""
 "calibre can send your books to you (or your reader) by email. Emails will be "
 "automatically sent for downloaded news to all email addresses that have Auto-"
 "send checked."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
 msgid "&Maximum number of waiting worker processes (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
 msgid "&Check database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
 msgid "&Install command line tools"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
 msgid "Open calibre &configuration directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
 msgid "Limit the max. simultaneous jobs to the available CPU &cores"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
 msgid "Debug &device detection"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
 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/config_ui.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
 msgid "Server &port:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:212
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:117
 msgid "&Username:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:213
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:119
 msgid "&Password:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
 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/config_ui.py:615
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
 msgid "Max. &cover size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:621
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:214
 msgid "&Show password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
 msgid "Max. &OPDS items per query:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
 msgid "Max. OPDS &ungrouped items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
 msgid "&Start Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:621
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
 msgid "St&op Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:626
 msgid "&Test Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
 msgid "Run server &automatically on startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:628
 msgid "View &server logs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:46
 msgid ""
 "<p>Remember to leave calibre running as the server only runs as long as "
@@ -5497,33 +5547,33 @@ msgid ""
 "the IP address of the computer calibre is running on."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:631
 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/config_ui.py:628
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:632
 msgid "Enable/&Disable plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:633
 msgid "&Customize plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:630
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:634
 msgid "&Remove plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:635
 msgid "Add new plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:632
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:636
 msgid "Plugin &file:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:634
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:638
 msgid "&Add"
 msgstr ""
 
@@ -5561,9 +5611,9 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:31
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:884
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:889
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Date"
 msgstr ""
@@ -5755,12 +5805,18 @@ msgstr ""
 msgid "ERROR"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:67
+msgid ""
+"All checked books will be <b>permanently deleted</b> from your device. "
+"Please verify the list."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 msgid "Location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1058
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1064
 msgid "Format"
 msgstr ""
 
@@ -6558,6 +6614,10 @@ msgstr ""
 msgid "Add tag to available tags and apply it to current book"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:20
+msgid "%s (was %s)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:501
 msgid "Item is blank"
@@ -6892,146 +6952,162 @@ msgstr ""
 msgid "Save single format to disk..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:53
 msgid "Edit metadata individually"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:56
 msgid "Edit metadata in bulk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:59
 msgid "Download metadata and covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:62
 msgid "Download only metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:64
 msgid "Download only covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:67
 msgid "Download only social metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:73
 msgid "Merge into first selected book - delete others"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:76
 msgid "Merge into first selected book - keep others"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:84
 msgid "Add books from a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:86
 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/init.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:90
 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/init.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:93
 msgid "Add Empty book. (Book entry with no formats)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:102
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
 msgid "Save to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Save to disk in a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:106
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:402
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:394
 msgid "Save only %s format to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:110
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:397
 msgid "Save only %s format to disk in a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:119
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
 msgid "View"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:121
 msgid "View specific format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:127
 msgid "Remove selected books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:129
 msgid "Remove files of a specific format from selected books.."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:132
 msgid "Remove all formats from selected books, except..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:135
 msgid "Remove covers from selected books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:138
 msgid "Remove matching books from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:155
 msgid "Convert individually"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:157
 msgid "Bulk convert"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:161
 msgid "Create catalog of books in your calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:169
 msgid "Run welcome wizard"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:205
 msgid "Similar books..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:237
 msgid "Add books to library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:234
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:241
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:253
 msgid "Manage collections"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:328
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:333
 msgid "Cover Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:351
 msgid "Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:372
+msgid "version"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:373
+msgid "created by Kovid Goyal"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:391
+msgid "Connected "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:400
+msgid "Update found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:454
 msgid "Book Details"
 msgstr ""
 
@@ -7115,29 +7191,29 @@ msgid "Rating"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:324
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1084
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:674
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1176
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1182
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:886
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:885
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:890
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1156
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1162
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1165
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr ""
 
@@ -7181,11 +7257,11 @@ msgstr ""
 msgid "Restore default layout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:524
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:525
 msgid "Not allowed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:526
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
@@ -7382,155 +7458,163 @@ msgstr ""
 msgid "try deleting the file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:247
 msgid "calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:249
 msgid "&Restrict to:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:250
 msgid ""
 "Books display will be restricted to those matching the selected saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:251
 msgid "set in ui.py"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:252
 msgid "Advanced search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
 msgid "Alt+S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
 msgid "&Search:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
 msgid ""
 "<p>Search the list of books by title, author, publisher, tags, comments, "
 "etc.<br><br>Words separated by spaces are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
 msgid "Reset Quick Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
-msgid "Choose saved search or enter name for new saved search"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
 msgid "Copy current search text (instead of search name)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
 msgid "Save current search under the name shown in the box"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
 msgid "Delete current saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
 msgid "Add books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
 msgid "A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
 msgid "Remove books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
 msgid "Del"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
 msgid "Edit meta information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
 msgid "E"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
 msgid "Merge book records"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
 msgid "M"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
 msgid "Send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
 msgid "S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
 msgid "Convert E-books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
 msgid "C"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
 msgid "V"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
 msgid "Open containing folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
 msgid "Show book details"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
 msgid "Books by same author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
 msgid "Books in this series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
 msgid "Books by this publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
 msgid "Books with the same tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
 msgid "Configure calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
 msgid "Ctrl+P"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
+msgid "Help"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
+msgid "Browse the calibre User Manual"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
+msgid "F1"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:20
 msgid ""
 "Redirect console output to a dialog window (both stdout and stderr). Useful "
@@ -7557,32 +7641,36 @@ msgstr ""
 msgid "No matches found for this book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:91
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:262
 msgid "Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:313
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:315
 msgid "The selected search will be <b>permanently deleted</b>. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:357
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:392
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:398
 msgid "Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:406
+msgid "Choose saved search or enter name for new saved search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:47
 msgid "({0} of {1})"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:53
 msgid "(all books)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:55
 msgid "({0} of all)"
 msgstr ""
 
@@ -7705,18 +7793,31 @@ msgstr ""
 msgid "Sort by average rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:775
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:772
+msgid "Set the sort order for entries in the Tag Browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:778
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:775
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:778
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:783
+msgid ""
+"When selecting multiple entries in the Tag Browser match any or all of them"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:787
 msgid "Manage &user categories"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:790
+msgid "Add your own categories to the Tag Browser"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182
 msgid "Convert book %d of %d (%s)"
@@ -7742,15 +7843,15 @@ msgstr ""
 msgid "Queueing "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:239
 msgid "Fetch news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:301
 msgid "Convert existing"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:302
 msgid ""
 "The following books have already been converted to %s format. Do you wish to "
 "reconvert them?"
@@ -7764,104 +7865,91 @@ msgstr ""
 msgid "&Donate to support calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:168
 msgid "&Eject connected device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:173
 msgid "&Restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:206
-msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:212
-msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:227
 msgid "Calibre Quick Start Guide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:389
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:381
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:377
 msgid "Cannot configure while there are running jobs."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:382
 msgid "Cannot configure before calibre is restarted."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:425
 msgid "No detailed info available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:426
 msgid "No detailed information is available for books on the device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:486
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:478
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:506
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:487
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:479
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using third party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:492
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:507
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:547
 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."
+"you find it useful, please consider donating to support its development. "
+"Your donation helps keep calibre development going."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:573
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:576
 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/ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:640
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:633
 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/update.py:52
-msgid ""
-"<span style=\"color:red; font-weight:bold\">Latest version: <a "
-"href=\"%s\">%s</a></span>"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/update.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:56
 msgid "Update available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/update.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:57
 msgid ""
 "%s has been updated to version %s. See the <a href=\"http://calibre-"
 "ebook.com/whats-new\">new features</a>. Visit the download page?"
@@ -8339,29 +8427,25 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:270
 msgid ""
 "Library\n"
-"%d\n"
-"books"
+"%d books"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:271
 msgid ""
 "Reader\n"
-"%s\n"
-"available"
+"%s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:272
 msgid ""
 "Card A\n"
-"%s\n"
-"available"
+"%s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:273
 msgid ""
 "Card B\n"
-"%s\n"
-"available"
+"%s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:277
@@ -8384,35 +8468,39 @@ msgstr ""
 msgid "Books located at"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:306
+msgid "free"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:557
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:558
 msgid "Upper Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:559
 msgid "Lower Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:560
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:561
 msgid "Title Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:974
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:983
 msgid "Drag to resize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1015
 msgid "Show"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1012
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1022
 msgid "Hide"
 msgstr ""
 
@@ -9681,89 +9769,89 @@ msgstr ""
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:706
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:708
 msgid "Download finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:708
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:710
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:714
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:716
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:716
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:718
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:718
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:720
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:807
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:809
 msgid "Could not fetch article. Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:828
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:830
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:833
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:835
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:839
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:841
 msgid "Trying to download cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:841
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:922
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:924
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:938
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:940
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:948
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:950
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:960
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
 msgid "Downloading cover from %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1002
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1190
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1192
 msgid "Untitled Article"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1261
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1263
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1272
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1274
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1289
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1291
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1436
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1438
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1452
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1454
 msgid ""
 "You do not have permission to download this issue. Either your subscription "
 "has expired or you have exceeded the maximum allowed downloads for today."
diff --git a/src/calibre/translations/ru.po b/src/calibre/translations/ru.po
index f992292b32..fce9115425 100644
--- a/src/calibre/translations/ru.po
+++ b/src/calibre/translations/ru.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre 0.4.55\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-03 01:21+0000\n"
-"PO-Revision-Date: 2010-07-02 18:11+0000\n"
-"Last-Translator: Kovid Goyal <Unknown>\n"
+"POT-Creation-Date: 2010-07-10 16:12+0000\n"
+"PO-Revision-Date: 2010-07-14 06:53+0000\n"
+"Last-Translator: Zhilin Ruslan <Unknown>\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: 2010-07-03 03:45+0000\n"
+"X-Launchpad-Export-Date: 2010-07-15 03:35+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: RUSSIAN FEDERATION\n"
 "X-Poedit-Language: Russian\n"
@@ -31,10 +31,10 @@ msgstr "Ничего не делает"
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:71
 #: /home/kovid/work/calibre/src/calibre/devices/prs500/books.py:267
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:466
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:396
-#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:98
-#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:101
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:492
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:398
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:97
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:100
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/metadata.py:56
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:428
 #: /home/kovid/work/calibre/src/calibre/ebooks/fb2/input.py:67
@@ -76,9 +76,9 @@ msgstr "Ничего не делает"
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:818
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:49
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:51
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:910
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:915
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:981
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:911
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:916
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:982
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:137
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:139
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:108
@@ -106,20 +106,20 @@ msgstr "Ничего не делает"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:233
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:290
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:815
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:818
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:814
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:817
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:172
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:179
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:22
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:135
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:903
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:912
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1192
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1195
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:899
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:908
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1191
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1194
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:120
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:155
@@ -127,8 +127,8 @@ msgstr "Ничего не делает"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:172
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:362
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:877
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1054
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:882
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1060
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:87
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:92
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:185
@@ -174,7 +174,7 @@ msgstr "Запись метаданных"
 msgid "Catalog generator"
 msgstr "Генератор каталога"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:15
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:16
 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 "
@@ -184,7 +184,7 @@ msgstr ""
 "содержащий все связанные файлы. Этот модуль запускается каждый раз, когда вы "
 "добавляете HTML файл в библиотеку."
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:51
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:52
 msgid ""
 "Character encoding for the input HTML files. Common choices include: cp1252, "
 "latin1, iso-8859-1 and utf-8."
@@ -192,7 +192,7 @@ msgstr ""
 "Кодировка для входящих HTML файлов. Наиболее популярные: cp1251, latin1, iso-"
 "8859-1 и utf-8."
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:58
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:59
 msgid ""
 "Create a PMLZ archive containing the PML file and all images in the "
 "directory pmlname_img or images. This plugin is run every time you add a PML "
@@ -202,49 +202,49 @@ msgstr ""
 "pmlname_img либо images. Этот плагин запускается каждый раз когда в "
 "библиотеку добавляется  PML-файл."
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:90
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:93
 msgid "Extract cover from comic files"
 msgstr "Извлечь обложку из файлов комикса"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:117
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:128
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:140
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:150
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:160
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:171
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:181
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:191
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:201
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:211
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:221
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:232
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:243
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:255
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:276
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:287
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:297
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:307
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:120
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:131
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:153
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:163
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:174
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:184
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:194
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:204
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:214
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:224
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:235
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:246
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:258
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:279
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:290
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:300
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:310
 msgid "Read metadata from %s files"
 msgstr "Читать метаданные из %s файлов"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:266
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:269
 msgid "Read metadata from ebooks in RAR archives"
 msgstr "Читать метаданные из книг в архивах RAR"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:318
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:321
 msgid "Read metadata from ebooks in ZIP archives"
 msgstr "Читать метаданные из книг в архивах ZIP"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:331
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:341
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:351
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:373
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:384
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:394
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:334
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:344
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:354
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:376
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:387
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:397
 msgid "Set metadata in %s files"
 msgstr "Внести метаданные в файлы %s"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:362
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:365
 msgid "Set metadata from %s files"
 msgstr "Внести метаданные из файлов %s"
 
@@ -293,8 +293,8 @@ msgstr ""
 msgid ""
 "This profile is intended for the SONY PRS line. The 500/505/600/700 etc."
 msgstr ""
-"Этот профиль предназначен для SONY PRS линейки моделей 500/505/600/700 и так "
-"далее."
+"Этот профиль предназначен для линейки моделей SONY PRS. 500/505/600/700 и "
+"так далее."
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:69
 msgid "This profile is intended for the SONY PRS 300."
@@ -404,35 +404,35 @@ msgstr ""
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr "Этот профиль предназначен для Amazon Kindle DX."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:31
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
 msgid "Installed plugins"
 msgstr "Установленные модули"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:33
 msgid "Mapping for filetype plugins"
 msgstr "Назначения модулей типов файлов"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:33
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:34
 msgid "Local plugin customization"
 msgstr "Настройка локального модуля"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:34
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
 msgid "Disabled plugins"
 msgstr "Отключенные модули"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
 msgid "Enabled plugins"
-msgstr "Включены плагины"
+msgstr "Включенные модули"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:83
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:84
 msgid "No valid plugin found in "
 msgstr "Не найден подходящий модуль в "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:460
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:468
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr "Неудачная инициализация модуля %s:"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:493
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
 msgid ""
 "    %prog options\n"
 "\n"
@@ -444,36 +444,36 @@ msgstr ""
 "    Настроить calibre при помощи внешних модулей.\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:499
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr "Установите модуль, указав путь к zip файлу, содержащему его."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr "Удалить модуль по имени. Не действует на встроенные модули"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:503
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:511
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
 msgstr ""
 "Настроить модуль. Укажите имя модуля и строку настроек, разделённые запятой."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:505
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:513
 msgid "List all installed plugins"
 msgstr "Вывести список всех установленных модулей"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Enable the named plugin"
 msgstr "Включить указанный модуль"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Disable the named plugin"
 msgstr "Отключить указанный модуль"
 
 #: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:13
 msgid "Communicate with Android phones."
-msgstr "Общение с телефонами Android."
+msgstr "Устанавливает связь с телефонами Android."
 
 #: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:45
 msgid ""
@@ -485,11 +485,11 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:77
 msgid "Communicate with S60 phones."
-msgstr "Связь с телефоном S60"
+msgstr "Устанавливает связь с телефоном S60"
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:87
 msgid "Communicate with iTunes/iBooks."
-msgstr ""
+msgstr "Устанавливать связь с iTunes/iBooks."
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:93
 msgid "Apple device detected, launching iTunes, please wait ..."
@@ -498,7 +498,7 @@ msgstr "Обнаружено устройство Apple, запуск iTunes, п
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:246
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:249
 msgid "Updating device metadata listing..."
-msgstr ""
+msgstr "Обновление списка метаданных устройства..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:323
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:362
@@ -521,7 +521,7 @@ msgstr "Использовать Серии как Категории в iTunes/
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:546
 msgid "Cache covers from iTunes/iBooks"
-msgstr ""
+msgstr "Кэш обложек iTunes/iBooks"
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:558
 msgid ""
@@ -555,15 +555,17 @@ msgstr "Новости"
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2698
 msgid "Communicate with iTunes."
-msgstr "Устанавить связь с iTunes"
+msgstr "Устанавливает связь с iTunes"
 
 #: /home/kovid/work/calibre/src/calibre/devices/binatone/driver.py:17
 msgid "Communicate with the Binatone Readme eBook reader."
-msgstr "Общение с устройством для чтения электронных книг Binatone Readme."
+msgstr ""
+"Устанавливает связь с устройством для чтения электронных книг Binatone "
+"Readme."
 
 #: /home/kovid/work/calibre/src/calibre/devices/blackberry/driver.py:13
 msgid "Communicate with the Blackberry smart phone."
-msgstr "Общение со смартфоном Blackberry."
+msgstr "Устанавливает связь со смартфоном Blackberry."
 
 #: /home/kovid/work/calibre/src/calibre/devices/blackberry/driver.py:14
 #: /home/kovid/work/calibre/src/calibre/devices/nuut2/driver.py:18
@@ -574,20 +576,23 @@ msgstr "Ковид Гоял"
 #: /home/kovid/work/calibre/src/calibre/devices/cybook/driver.py:22
 msgid "Communicate with the Cybook Gen 3 / Opus eBook reader."
 msgstr ""
-"Общение с устройством для чтения электронных книг Cybook Gen 3 / Opus eBook."
+"Устанавливает связь с устройством для чтения электронных книг Cybook Gen 3 / "
+"Opus eBook."
 
 #: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:24
 msgid "Communicate with the EB600 eBook reader."
-msgstr "Соединяться с EB600."
+msgstr "Устанавливает связь с устройством для чтения электронных книг EB600."
 
 #: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:193
 msgid "Communicate with the Astak Mentor EB600"
-msgstr "Устанавить связь c  Astak Mentor EB600"
+msgstr ""
+"Устанавливает связь с устройством для чтения электронных книг c Astak Mentor "
+"EB600"
 
 #: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:216
 msgid "Communicate with the PocketBook 301 reader."
 msgstr ""
-"Устанавить связь c устройством для чтения электронных книг PocketBook 301."
+"Устанавливает связь с устройством для чтения электронных книг PocketBook 301."
 
 #: /home/kovid/work/calibre/src/calibre/devices/edge/driver.py:17
 msgid "Entourage Edge"
@@ -595,20 +600,22 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/edge/driver.py:18
 msgid "Communicate with the Entourage Edge."
-msgstr "Устанавить связь c  Entourage Edge."
+msgstr "Устанавливает связь с  Entourage Edge."
 
 #: /home/kovid/work/calibre/src/calibre/devices/eslick/driver.py:16
 msgid "Communicate with the ESlick eBook reader."
-msgstr "Соединяться с ESlick."
+msgstr ""
+"Устанавливает связь с устройством для чтения электронных книг ESlick."
 
 #: /home/kovid/work/calibre/src/calibre/devices/eslick/driver.py:49
 msgid "Communicate with the Sigmatek eBook reader."
-msgstr "Устанавить связь c устройством для чтения электронных книг Sigmatek."
+msgstr ""
+"Устанавливает связь с устройством для чтения электронных книг Sigmatek."
 
 #: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:16
 #: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:30
 msgid "Use an arbitrary folder as a device."
-msgstr ""
+msgstr "Использовать произвольную папку как устройство."
 
 #: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:26
 #: /home/kovid/work/calibre/src/calibre/devices/interface.py:23
@@ -617,48 +624,54 @@ msgstr "Интерфейс устройства"
 
 #: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:19
 msgid "Communicate with Hanlin V3 eBook readers."
-msgstr "Соединяться с Hanlin V3"
+msgstr ""
+"Устанавливает связь с устройствоми для чтения электронных книг Hanlin V3"
 
 #: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:87
 msgid "Communicate with Hanlin V5 eBook readers."
-msgstr "Соединяться с Hanlin V5"
+msgstr ""
+"Устанавливает связь с устройствоми для чтения электронных книг Hanlin V5"
 
 #: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:106
 msgid "Communicate with the BOOX eBook reader."
-msgstr "Соединяться с BOOX"
+msgstr "Устанавливает связь с устройством для чтения электронных книг BOOX"
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:121
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:123
 msgid ""
 "Comma separated list of directories to send e-books to on the device. The "
 "first one that exists will be used."
 msgstr ""
+"Запятая разделяет список каталогов, для отправки электронных книг на "
+"устройство. Будет использоваться первый существующий."
 
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:18
 msgid "Communicate with the Hanvon N520 eBook reader."
-msgstr "Communicate with the Hanvon N520"
+msgstr ""
+"Устанавливает связь с устройством для чтения электронных книг Hanvon N520."
 
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:40
 msgid "Communicate with The Book reader."
-msgstr "Устанавить связь c устройством для чтения электронных книг"
+msgstr "Устанавливает связь с устройством для чтения электронных книг"
 
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:51
 msgid "Communicate with the SpringDesign Alex eBook reader."
 msgstr ""
-"Устанавить связь c устройством для чтения электронных книг \"SpringDesign "
-"Alex\""
+"Устанавливает связь c устройством для чтения электронных книг \"SpringDesign "
+"Alex\"."
 
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:67
 msgid "Communicate with the Azbooka"
-msgstr ""
-"Устанавить связь c устройством для чтения электронных книг \"Azbooka\""
+msgstr "Устанавливает связь с \"Azbooka\""
 
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:80
 msgid "Communicate with the Elonex EB 511 eBook reader."
-msgstr "Связь с электронной книгой Elonex EB 511"
+msgstr ""
+"Устанавливает связь с устройством для чтения электронных книг Elonex EB 511."
 
 #: /home/kovid/work/calibre/src/calibre/devices/iliad/driver.py:16
 msgid "Communicate with the IRex Iliad eBook reader."
-msgstr "Соединяться с IRex Iliad."
+msgstr ""
+"Устанавливает связь с устройством для чтения электронных книг IRex Iliad."
 
 #: /home/kovid/work/calibre/src/calibre/devices/iliad/driver.py:17
 #: /home/kovid/work/calibre/src/calibre/devices/irexdr/driver.py:18
@@ -668,93 +681,104 @@ msgstr "Джош Шембер"
 
 #: /home/kovid/work/calibre/src/calibre/devices/irexdr/driver.py:16
 msgid "Communicate with the IRex Digital Reader 1000 eBook reader."
-msgstr "Соединяться с iRex Digital Reader 1000."
+msgstr ""
+"Устанавливает связь с устройством для чтения электронных книг iRex Digital "
+"Reader 1000."
 
 #: /home/kovid/work/calibre/src/calibre/devices/irexdr/driver.py:42
 msgid "Communicate with the IRex Digital Reader 800"
-msgstr "Сообщение с IRex Digital Reader 800."
+msgstr "Устанавливает связь с IRex Digital Reader 800."
 
 #: /home/kovid/work/calibre/src/calibre/devices/iriver/driver.py:15
 msgid "Communicate with the Iriver Story reader."
-msgstr "Соединяться с Iriver Story."
+msgstr ""
+"Устанавливает связь с устройством для чтения электронных книг Iriver Story."
 
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:20
 msgid "Communicate with the JetBook eBook reader."
-msgstr "Соединяться с JetBook."
+msgstr ""
+"Устанавливает связь с устройством для чтения электронных книг JetBook."
 
 #: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:42
 msgid "Communicate with the Kindle eBook reader."
-msgstr "Соединяться с Kindle."
+msgstr ""
+"Устанавливает связь с устройством для чтения электронных книг Kindle."
 
 #: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:169
 msgid "Communicate with the Kindle 2 eBook reader."
-msgstr "Соединяться с Kindle 2."
+msgstr ""
+"Устанавливает связь с устройством для чтения электронных книг Kindle 2."
 
 #: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:210
 msgid "Communicate with the Kindle DX eBook reader."
-msgstr "Соединяться с Kindle DX."
+msgstr ""
+"Устанавливает связь с устройством для чтения электронных книг Kindle DX."
 
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:22
 msgid "Communicate with the Kobo Reader"
-msgstr "Связь с Kobo Reader"
+msgstr "Устанавливает связь с устройством для чтения электронных книг Kobo"
 
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:51
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:54
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:57
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:157
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:159
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:64
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:67
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:70
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:130
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:137
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:160
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:139
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:162
 msgid "Getting list of books on device..."
 msgstr "Получаю список книг с устройства..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:218
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:258
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:244
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:262
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:219
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:263
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:246
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:264
 msgid "Removing books from device..."
 msgstr "Удаляю книги с устройства..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:262
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:269
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:269
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:274
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:267
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:274
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:271
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:276
 msgid "Removing books from device metadata listing..."
 msgstr "Удаляю книги из списка метаданных устройства..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:274
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:308
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:208
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:238
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:313
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:210
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:240
 msgid "Adding books to device metadata listing..."
 msgstr "Добавляю книги в список метаданных устройства..."
 
 #: /home/kovid/work/calibre/src/calibre/devices/misc.py:15
 msgid "Communicate with the Palm Pre"
-msgstr "Связь с Palm Pre"
+msgstr "Устанавливает связь с Palm Pre"
 
 #: /home/kovid/work/calibre/src/calibre/devices/misc.py:35
 msgid "Communicate with the Booq Avant"
-msgstr "Устанавить связь c Booq Avant"
+msgstr "Устанавливает связь с Booq Avant"
 
 #: /home/kovid/work/calibre/src/calibre/devices/misc.py:55
 msgid "Communicate with the Sweex MM300"
-msgstr ""
+msgstr "Устанавливает связь с Sweex MM300"
+
+#: /home/kovid/work/calibre/src/calibre/devices/misc.py:75
+msgid "Communicate with the Pandigital Novel"
+msgstr "Устанавливать связь с Pandigital Novel"
 
 #: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:17
 msgid "Communicate with the Nokia 770 internet tablet."
-msgstr "Подключен к Nokia 770 internet tablet."
+msgstr "Устанавливает связь с Nokia 770 internet tablet."
 
 #: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:40
 msgid "Communicate with the Nokia 810 internet tablet."
-msgstr "Подключен к Nokia 810 internet tablet."
+msgstr "Устанавливает связь с Nokia 810 internet tablet."
 
 #: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:74
 msgid "Communicate with the Nokia E52"
-msgstr ""
+msgstr "Устанавливать связь с Nokia E52"
 
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:20
 msgid "The Nook"
@@ -762,19 +786,21 @@ msgstr "Укромный уголок"
 
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:21
 msgid "Communicate with the Nook eBook reader."
-msgstr "Работать с устройством Nook eBook reader."
+msgstr "Устанавливает связь с устройством для чтения электронных книг Nook"
 
 #: /home/kovid/work/calibre/src/calibre/devices/nuut2/driver.py:17
 msgid "Communicate with the Nuut2 eBook reader."
-msgstr "Соединяться с Nuut2."
+msgstr "Устанавливает связь с устройством для чтения электронных книг Nuut2."
 
 #: /home/kovid/work/calibre/src/calibre/devices/prs500/driver.py:89
 msgid "Communicate with the Sony PRS-500 eBook reader."
-msgstr "Соединяться с Sony PRS-500."
+msgstr ""
+"Устанавливает связь с устройством для чтения электронных книг Sony PRS-500."
 
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:22
 msgid "Communicate with all the Sony eBook readers."
-msgstr "Устанавить связь c устройствами для чтения электронных книг \"Sony\""
+msgstr ""
+"Устанавливает связь с устройствами для чтения электронных книг \"Sony\""
 
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
 msgid ""
@@ -791,21 +817,23 @@ msgstr "Безымянный"
 
 #: /home/kovid/work/calibre/src/calibre/devices/sne/driver.py:17
 msgid "Communicate with the Samsung SNE eBook reader."
-msgstr "Связь с электронной книгой Samsung SNE"
+msgstr ""
+"Устанавливает связь с устройством для чтения электронных книг Samsung SNE"
 
 #: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:11
 msgid "Communicate with the Teclast K3 reader."
-msgstr "Сообщение с Teclast K3 reader."
+msgstr ""
+"Устанавливает связь с устройством для чтения электронных книг Teclast K3."
 
 #: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:37
 msgid "Communicate with the Newsmy reader."
 msgstr ""
-"Устанавить связь c устройством для чтения электронных книг \"Newsmy\""
+"Устанавливает связь с устройством для чтения электронных книг \"Newsmy\""
 
 #: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:49
 msgid "Communicate with the iPapyrus reader."
 msgstr ""
-"Устанавить связь c устройством для чтения электронных книг \"iPapyrus\""
+"Устанавливает связь с устройством для чтения электронных книг \"iPapyrus\""
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:245
 msgid "Unable to detect the %s disk drive. Try rebooting."
@@ -896,12 +924,12 @@ msgstr "Соединиться с электронной книгой."
 msgid "Get device information..."
 msgstr "Получаю информацию об устройстве..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:188
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:192
 msgid "Transferring books to device..."
 msgstr "Передаю книги на устройство..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:305
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:307
 msgid "Sending metadata to device..."
 msgstr "Отправляю метаданные на устройство..."
 
@@ -1140,7 +1168,7 @@ msgstr ""
 "итоге, если конечный_файл не имеет расширения, в таком случае он "
 "определяется как каталог, и в него записывается содержимое в формате \"open "
 "ebook\" (OEB), состоящее из HTML файлов. Эти файлы обычно отправляются в "
-"плагин вывода.\n"
+"модуль вывода.\n"
 "\n"
 "После определения исходного и конечного файлов вы можете настроить "
 "преобразование, указав различные опции. Доступные опции зависят от формата "
@@ -1433,6 +1461,12 @@ msgid ""
 "\"original\" (the default) does not change justification in the source file. "
 "Note that only some output formats support justification."
 msgstr ""
+"Изменить выравнивание текста . Значение \"Влево\" преобразует все "
+"выравнивание текста из источника в выравнивание по левому краю (то есть не "
+"выравненому). Значение \"Выравнить\" преобразует весь не выравненный текст в "
+"выровненный. Значение \"оригинал\" (по умолчанию) не изменяет выравнивание в "
+"исходном файле. Обратите внимание, что только некоторые выходные форматы "
+"поддерживают выравнивание."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:316
 msgid ""
@@ -1545,6 +1579,12 @@ msgid ""
 "corresponding pair of normal characters. This option will preserve them "
 "instead."
 msgstr ""
+"Сохранить лигатуры в этом входном документе. Лигатура - специальный "
+"рендеринг пары символов, таких как ff, fi, fl и так далее. У большинства "
+"устройств для чтения электронных книг нет поддержки лигатур в их заданных по "
+"умолчанию шрифтах, таким образом, они вряд ли отобразятся правильно. По "
+"умолчанию, calibre превратит лигатуру в соответствующую пару нормальных "
+"символов. Эта опция сохранит их вместо этого."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:428
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:38
@@ -1646,6 +1686,62 @@ msgstr "Выполняю преобразования книги..."
 msgid "Creating"
 msgstr "Создаю"
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/__init__.py:18
+msgid "ePub Fixer"
+msgstr "Наладчик ePub"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/epubcheck.py:18
+msgid "Workaround epubcheck bugs"
+msgstr "Обходной путь ошибок epubcheck"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/epubcheck.py:22
+msgid ""
+"Workarounds for bugs in the latest release of epubcheck. epubcheck reports "
+"many things as errors that are not actually errors. epub-fix will try to "
+"detect these and replace them with constructs that epubcheck likes. This may "
+"cause significant changes to your epub, complain to the epubcheck project."
+msgstr ""
+"Обходной путь для ошибок в последнем выпуске epubcheck. epubcheck сообщает о "
+"многих вещах, которые фактически не являются ошибками, как об ошибках. epub-"
+"исправление попытается обнаружить их и заменить на конструкции, которые "
+"понравятся epubcheck. Это может вызвать значительные изменения в Epub, "
+"жаловаться в проекте epubcheck."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:19
+msgid ""
+"%prog [options] file.epub\n"
+"\n"
+"Fix common problems in EPUB files that can cause them to be rejected by "
+"poorly designed publishing services.\n"
+"\n"
+"By default, no fixing is done and messages are printed out for each error "
+"detected. Use the options to control which errors are automatically fixed."
+msgstr ""
+"%prog [опции] фаил.epub\n"
+"Исправляет обычные проблемы в файлах EPUB, которые могут быть причиной их "
+"отбраковки в непредназначенных службах издательских систем.\n"
+"По умолчанию, никакие исправления не вносятся, и сообщения отображаются для "
+"каждой обнаруженной ошибки. Используйте опции, чтобы настроить, какие ошибки "
+"исправлять автоматически."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:50
+msgid "You must specify an epub file"
+msgstr "Вы должны указывать файл epub"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:17
+msgid "Fix unmanifested files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:21
+msgid ""
+"Fix unmanifested files. epub-fix can either add them to the manifest or "
+"delete them as specified by the delete unmanifested option."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:32
+msgid "Delete unmanifested files instead of adding them to the manifest"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:56
 msgid ""
 "Extract the contents of the generated EPUB file to the specified directory. "
@@ -1754,7 +1850,7 @@ msgid ""
 "can result in various nasty side effects in the rest of of the conversion "
 "pipeline."
 msgstr ""
-"Обычно этот плагин ввода перераспределяет все входные файлы по стандартной "
+"Обычно этот модуль ввода перераспределяет все входные файлы по стандартной "
 "иерархии папок. Используйте эту опцию только в том случае, если Вы уверены в "
 "том, что делаете, иначе она может привести к непредсказуемым побочным "
 "эффектам."
@@ -2007,11 +2103,11 @@ msgstr "Комикс"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:98
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:882
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:887
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:543
 msgid "Title"
 msgstr "Заголовок"
@@ -2020,7 +2116,7 @@ msgstr "Заголовок"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:364
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:883
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:888
 msgid "Author(s)"
 msgstr "Автор(ы)"
 
@@ -2043,7 +2139,7 @@ msgstr "Спонсор"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:67
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:318
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1073
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1079
 msgid "Comments"
 msgstr "Комментарии"
 
@@ -2052,7 +2148,7 @@ msgstr "Комментарии"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:306
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1069
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1075
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:139
 msgid "Tags"
 msgstr "Теги"
@@ -2062,7 +2158,7 @@ msgstr "Теги"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:323
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1084
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:87
 msgid "Series"
 msgstr "Серия"
@@ -2072,7 +2168,7 @@ msgid "Language"
 msgstr "Язык"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:406
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1067
 msgid "Timestamp"
 msgstr "Временная метка"
 
@@ -2218,7 +2314,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/douban.py:42
 msgid "Downloads metadata from Douban.com"
-msgstr ""
+msgstr "Загружает метаданные с Douban.com"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:34
 msgid "Metadata download"
@@ -2226,7 +2322,7 @@ msgstr "Загрузка метаданных"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:111
 msgid "ratings"
-msgstr "рейтинги"
+msgstr "оценки"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:111
 msgid "tags"
@@ -2262,7 +2358,7 @@ msgstr "Загрузить общедоступные метаданные из
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:213
 msgid "Downloads series/tags/rating information from librarything.com"
-msgstr ""
+msgstr "Загружает информацию о Сериях/Тегах/Оценках с librarything.com"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:95
 msgid ""
@@ -2334,7 +2430,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1226
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1398
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1399
 msgid "Cover"
 msgstr "Обложка"
 
@@ -2375,70 +2471,70 @@ msgstr "Все статьи"
 msgid "This is an Amazon Topaz book. It cannot be processed."
 msgstr "Это книга Amazon Topaz. Она не может быть прочитана."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1399
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1400
 msgid "Title Page"
 msgstr "Титульная страница"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1400
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1401
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:15
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:53
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:194
 msgid "Table of Contents"
 msgstr "Содержание"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1401
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1402
 msgid "Index"
 msgstr "Индекс"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1402
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1403
 msgid "Glossary"
 msgstr "Глоссарий"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1403
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1404
 msgid "Acknowledgements"
 msgstr "Подтверждения"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1404
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1405
 msgid "Bibliography"
 msgstr "Библиография"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1405
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1406
 msgid "Colophon"
 msgstr "эмблема издательства"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1406
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1407
 msgid "Copyright"
 msgstr "Копирайт"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1407
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1408
 msgid "Dedication"
 msgstr "Посвящение"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1408
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1409
 msgid "Epigraph"
 msgstr "Эпиграф"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1409
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1410
 msgid "Foreword"
 msgstr "Предисловие"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1410
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1411
 msgid "List of Illustrations"
 msgstr "Список иллюстраций"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1411
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1412
 msgid "List of Tables"
 msgstr "Оглавление"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1412
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1413
 msgid "Notes"
 msgstr "Заметки"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1413
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1414
 msgid "Preface"
 msgstr "Введение"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1414
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1415
 msgid "Main Text"
 msgstr "Основной текст"
 
@@ -2485,7 +2581,7 @@ msgstr "Врезка"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:22
 #: /home/kovid/work/calibre/src/calibre/ebooks/tcr/input.py:23
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:23
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:24
 msgid ""
 "Normally calibre treats blank lines as paragraph markers. With this option "
 "it will assume that every line represents a paragraph instead."
@@ -2495,7 +2591,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:26
 #: /home/kovid/work/calibre/src/calibre/ebooks/tcr/input.py:27
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:27
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:28
 msgid ""
 "Normally calibre treats blank lines as paragraph markers. With this option "
 "it will assume that every line starting with an indent (either a tab or 2+ "
@@ -2655,7 +2751,7 @@ msgstr ""
 "Получить информацию о PDF.\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
 msgid "Author"
 msgstr "Автор"
@@ -2824,19 +2920,19 @@ msgstr ""
 "Укажите степень сжатия. По шкале от 1 до 10, где 1 это минимальное сжатие на "
 "высокой скорости, а 10 это максимальное сжатие на низкой скорости."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:33
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:34
 msgid ""
 "Normally extra spaces are condensed into a single space. With this option "
 "all spaces will be displayed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:36
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:37
 msgid ""
 "Run the text input through the markdown pre-processor. To learn more about "
 "markdown see"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:39
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:40
 msgid "Do not insert a Table of Contents into the output text."
 msgstr "Не вставлять Содержимое в резултирующий текст."
 
@@ -2970,7 +3066,7 @@ msgstr "Максимальное количество ожидающих раб
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95
 msgid "Download social metadata (tags/rating/etc.)"
-msgstr "Скачать социальные метаданные (тэги/рейтинги/и т.д.)"
+msgstr "Скачать социальные метаданные (тэги/оценки/и т.д.)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97
 msgid "Overwrite author and title with new metadata"
@@ -2988,7 +3084,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:103
 msgid "The layout of the user interface"
-msgstr ""
+msgstr "Схема размещения пользовательского интерфейса"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105
 msgid "Show the average rating per item indication in the tag browser"
@@ -2996,7 +3092,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:107
 msgid "Disable UI animations"
-msgstr ""
+msgstr "Отключить анимацию пользовальского интерфейса"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:155
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:476
@@ -3011,14 +3107,14 @@ msgstr "Копировать"
 msgid "Copy to Clipboard"
 msgstr "Копирования в буфер обмена"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:400
 msgid "Choose Files"
 msgstr "Выберите файлы"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:67
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:245
 msgid "Use library only"
-msgstr ""
+msgstr "Использовать только библиотеку"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:246
@@ -3026,13 +3122,13 @@ msgid "User annotations generated from main library only"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:75
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:612
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:671
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:708
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:729
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:877
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1060
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:670
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:707
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:728
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:876
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:941
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1059
 msgid "No books selected"
 msgstr "Нет Выбранных книг"
 
@@ -3066,150 +3162,150 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:291
 msgid "How many empty books?"
-msgstr ""
+msgstr "Сколько пустых книг?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:292
 msgid "How many empty books should be added?"
-msgstr ""
+msgstr "Сколько пустых книг должно быть добавлено?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:340
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:390
 msgid "Uploading books to device."
 msgstr "Загрузка книг в устройство."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:350
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:137
 msgid "Books"
 msgstr "Книги"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
 msgid "EPUB Books"
 msgstr "Книги EPUB"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
 msgid "LRF Books"
 msgstr "Книги LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
 msgid "HTML Books"
 msgstr "Книги HTML"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
 msgid "LIT Books"
 msgstr "Книги LIT"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
 msgid "MOBI Books"
 msgstr "Книги MOBI"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
 msgid "Topaz books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
 msgid "Text books"
 msgstr "Текстовые книги"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:359
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
 msgid "PDF Books"
 msgstr "Книги PDF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:359
 msgid "Comics"
 msgstr "Комиксы"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:360
 msgid "Archives"
 msgstr "Архивы"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:364
 msgid "Supported books"
 msgstr "Поддерживаемые книги"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:399
 msgid "Merged some books"
 msgstr "Объединить книги"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:401
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:400
 msgid ""
 "Some duplicates were found and merged into the following existing books:"
 msgstr ""
 "Некоторые дубликаты были найдены и объединены в следующие существующие книги:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:409
 msgid "Failed to read metadata"
 msgstr "Сбой чтения метаданных"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:410
 msgid "Failed to read metadata from the following"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:434
 msgid "Add to library"
 msgstr "Добавить в библиотеку"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:460
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1229
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:459
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1228
 msgid "No book selected"
 msgstr "Нет выбранных книг"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:434
 msgid "No book files found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:456
 msgid "Cannot delete"
 msgstr "Не удается удалить"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:469
 msgid "Choose formats to be deleted"
 msgstr "Выберите форматы для удаления"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:488
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:487
 msgid "Choose formats <b>not</b> to be deleted"
-msgstr ""
+msgstr "Выберите форматы, которые <b>не</b> будут удалены"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:507
 msgid "Cannot delete books"
 msgstr "Не удается удалить книги"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:509
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:508
 msgid "No device is connected"
 msgstr "Устройство не подключено"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:519
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:518
 msgid "Main memory"
 msgstr "Основная память"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:520
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:444
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:519
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:454
 msgid "Storage Card A"
 msgstr "Карта памяти 1"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:521
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:446
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:455
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:447
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:456
 msgid "Storage Card B"
 msgstr "Карта памяти 2"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:525
 msgid "No books to delete"
 msgstr "Нет книг для удаления"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:526
 msgid "None of the selected books are on the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:544
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:600
 msgid "Deleting books from device."
 msgstr "Удаляются книги из устройства."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:564
 msgid ""
 "The selected books will be <b>permanently deleted</b> and the files removed "
 "from your computer. Are you sure?"
@@ -3217,67 +3313,67 @@ msgstr ""
 "Выбранные книги будут <b>навсегда удалены</b> вместе с файлами с Вашего "
 "компьютера. Вы уверены?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:585
 msgid ""
 "The selected books will be <b>permanently deleted</b> from your device. Are "
 "you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:610
 msgid "Cannot download metadata"
 msgstr "Не удалось загрузить метаданные"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:627
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
 msgid "social metadata"
-msgstr ""
+msgstr "социальные метаданные"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
 msgid "covers"
 msgstr "обложек"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
 msgid "metadata"
 msgstr "метаданных"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:630
 msgid "Downloading %s for %d book(s)"
 msgstr "Загрузка %s для %d книг(и)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:654
 msgid "Failed to download some metadata"
 msgstr "Не удалось загрузить некоторые метаданные"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:656
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
 msgid "Failed to download metadata for the following:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:659
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:658
 msgid "Failed to download metadata:"
 msgstr "Не удалось загрузить метаданные:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:660
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:637
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:522
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:949
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:659
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:638
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:951
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
 msgid "Error"
 msgstr "Ошибка"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:670
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:707
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:669
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:706
 msgid "Cannot edit metadata"
 msgstr "Невозможно редактировать метаданные"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:728
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:731
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:727
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:730
 msgid "Cannot merge books"
 msgstr "Не удается объединить книги"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:732
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:731
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:736
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:735
 msgid ""
 "All book formats and metadata from the selected books will be added to the "
 "<b>first selected book.</b><br><br> The second and subsequently selected "
@@ -3285,7 +3381,7 @@ msgid ""
 "proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:747
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:746
 msgid ""
 "All book formats and metadata from the selected books will be merged into "
 "the <b>first selected book</b>.<br><br>After merger the second and "
@@ -3295,99 +3391,99 @@ msgid ""
 "from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:759
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:758
 msgid ""
 "You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
 "proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:876
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:875
 msgid "Cannot save to disk"
 msgstr "Невозможно сохранить на диск"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:878
 msgid "Choose destination directory"
 msgstr "Выберете директорию получателя"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:912
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:911
 msgid "Error while saving"
 msgstr "Ошибка при сохранении"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:913
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:912
 msgid "There was an error while saving."
 msgstr "Произошла ошибка при сохранении."
 
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:919
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:920
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:921
 msgid "Could not save some books"
 msgstr "Не удалось сохранить некоторые книги"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:922
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:921
 msgid "Click the show details button to see which ones."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
 msgid "No books selected to generate catalog for"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:960
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:959
 msgid "Generating %s catalog..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:965
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:964
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:264
 msgid "No books found"
 msgstr "Книги не найдены"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:966
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:965
 msgid ""
 "No books to catalog\n"
 "Check exclude tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:976
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:975
 msgid "Catalog generated."
-msgstr ""
+msgstr "Каталог произведен."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:979
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:978
 msgid "Export Catalog Directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:980
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:979
 msgid "Select destination for %s.%s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:996
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:995
 msgid "Fetching news from "
 msgstr "Вызвать новость из "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1009
 msgid " fetched."
 msgstr " загружено."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1059
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1058
 msgid "Cannot convert"
 msgstr "Не преобразуется"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1088
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1087
 msgid "Starting conversion of %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1265
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1264
 msgid "Cannot view"
 msgstr "Невозможно просмотреть"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1209
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
 msgid "Choose the format to view"
 msgstr "Выберете для просмотра формат"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1218
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1217
 msgid "Multiple Books Selected"
 msgstr "Выбраны несколько книг"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1219
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1218
 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 "
@@ -3395,11 +3491,11 @@ msgid ""
 "continue?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1227
 msgid "Cannot open folder"
 msgstr "Не могу открыть папку"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1266
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1265
 msgid "%s has no available formats."
 msgstr "%s неизвестный формат."
 
@@ -3424,7 +3520,7 @@ msgid "The specified directory could not be processed."
 msgstr "Специальных каталог не может быть обработан."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:845
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr "Нет книг"
 
@@ -3482,19 +3578,19 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:109
 #: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:65
 msgid "Choose root folder"
-msgstr ""
+msgstr "Выберите корневую папку"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:137
 msgid "Invalid root folder"
-msgstr ""
+msgstr "Неподходящая корневая папка"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:138
 msgid "is not a valid root folder"
-msgstr ""
+msgstr "не допустимая корневой каталог"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:148
 msgid "Add books to calibre"
-msgstr ""
+msgstr "Добавить книги в Calibre"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/scan_ui.py:21
 #: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:57
@@ -3503,15 +3599,15 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/library_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:41
 msgid "WizardPage"
-msgstr ""
+msgstr "Страница мастера"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/scan_ui.py:22
 msgid "Scanning root folder for books"
-msgstr ""
+msgstr "Сканирование корневого каталога на наличие книг"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/scan_ui.py:23
 msgid "This may take a few minutes"
-msgstr ""
+msgstr "Это может занять несколько минут"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:58
 msgid "Choose the location to add books from"
@@ -3519,7 +3615,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:59
 msgid "Select a folder on your hard disk"
-msgstr ""
+msgstr "Выбирите каталог на вашем жестком диске"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:60
 msgid ""
@@ -3532,10 +3628,18 @@ msgid ""
 "<p>Make sure that the folder you chose for your calibre library <b>is "
 "not</b> under the root folder you choose.</p>"
 msgstr ""
+"<p>calibre может просканировать ваш компьютер на существующие книги "
+"автоматически. Эти книги будут <b>скопированны</b> в библиотеку calibre. "
+"Этот мастер поможет вам настроить сканирование и процесс импорта для вашей "
+"существующей книжной коллекции.</p>\n"
+"<p>Выберите корневую папку. Книги будут разыскиваться только в этой папке и "
+"любых подпапках.</p> \n"
+"<p>Удостоверьтесь, что папка, которую вы выбрали для своей библиотеки "
+"calibre, <b>не</b> в  папке выбраной вами корневой.</p>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:63
 msgid "&Root folder:"
-msgstr ""
+msgstr "Корневой каталог:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:64
 msgid ""
@@ -3551,15 +3655,15 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:52
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:633
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:637
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:366
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:371
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:385
@@ -3583,12 +3687,12 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:259
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:265
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:186
@@ -3618,8 +3722,9 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:313
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1059
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1065
 msgid "Path"
 msgstr "Путь"
 
@@ -3636,32 +3741,32 @@ msgid "Formats"
 msgstr "Форматы"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:25
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:886
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1062
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:891
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1068
 msgid "Collections"
-msgstr ""
+msgstr "Коллекции"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:56
 msgid "Click to open"
-msgstr ""
+msgstr "Щелкните, чтобы открыть"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:305
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:311
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:317
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1068
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1072
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1074
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:458
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:274
 msgid "None"
 msgstr "Ничего"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:310
 msgid "Click to open Book Details window"
-msgstr ""
+msgstr "Щелкните, чтобы открыть окно Book Details"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml.py:16
 msgid "CSV/XML Options"
@@ -4171,15 +4276,15 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:128
 msgid "&Serif font family:"
-msgstr ""
+msgstr "Семейство шрифтов &Serif:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:129
 msgid "S&ans-serif font family:"
-msgstr ""
+msgstr "Семейство шрифтов S&ans-serif:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:130
 msgid "&Monospaced font family:"
-msgstr ""
+msgstr "Семейство шрифтов &Monospaced:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:114
@@ -4295,7 +4400,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:174
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:381
 msgid "&Series:"
-msgstr "Серии:"
+msgstr "Серия:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:182
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:183
@@ -4521,12 +4626,12 @@ msgid "Footer regular expression:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:56
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:76
 msgid "Invalid regular expression"
 msgstr "Неправильное регулярное выражение"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:77
 msgid "Invalid regular expression: %s"
 msgstr "Неправильное регулярное выражение: %s"
 
@@ -4734,11 +4839,11 @@ msgid ""
 "href=\"http://calibre-ebook.com/user_manual/xpath.html\">XPath Tutorial</a>."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:127
 msgid "Cover browser could not be loaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:179
 msgid "Browse by covers"
 msgstr "Просмотр по обложкам"
 
@@ -4787,134 +4892,134 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:475
 msgid "Remove all tags"
-msgstr ""
+msgstr "Удалить все тэги"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:496
 msgid "tags to add"
-msgstr ""
+msgstr "тэги для добавления"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:501
 msgid "tags to remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:49
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:135
 msgid "No details available."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:155
 msgid "Device no longer connected."
 msgstr "Устройство не подключено"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:270
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:271
 msgid "Get device information"
 msgstr "Получить информацию о устройстве"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:282
 msgid "Get list of books on device"
 msgstr "Получить список книг на устройстве"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:292
 msgid "Get annotations from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:301
 msgid "Send metadata to device"
 msgstr "Отправить метаданные в устройство"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:305
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:306
 msgid "Send collections to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:330
 msgid "Upload %d books to device"
 msgstr "Загружено %d книг на устройство"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:345
 msgid "Delete books from device"
 msgstr "Удалить книги из устройства"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:362
 msgid "Download books from device"
 msgstr "Загрузить книги из устройства"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:372
 msgid "View book on device"
 msgstr "Смотреть книги на устройстве"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:408
 msgid "Set default send to device action"
 msgstr "Установить действие по умолчанию для \"отправить в устройство\""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:413
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:420
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:422
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:425
 msgid "Email to"
-msgstr "Отправить email"
+msgstr "Отправить по электронной почте к"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:425
 msgid " and delete from library"
-msgstr ""
+msgstr " и удалить из библиотеки"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:434
 msgid "Send to main memory"
 msgstr "Отправить в основную память"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:436
 msgid "Send to storage card A"
 msgstr "Отправить на карту памяти A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:437
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:438
 msgid "Send to storage card B"
 msgstr "Отправить на карту памяти B"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:442
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:452
 msgid "Main Memory"
-msgstr ""
+msgstr "Основная память"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:469
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:470
 msgid "Send and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:471
 msgid "Send specific format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:509
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:510
 msgid "Connect to folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:516
 msgid "Connect to iTunes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:521
 msgid "Eject device"
-msgstr ""
+msgstr "Извлечь устройство"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:529
 msgid "Fetch annotations (experimental)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:638
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:639
 msgid "Error communicating with device"
 msgstr "Ошибка подключения с устройством"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:659
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:660
 msgid "Select folder to open as device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:704
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:705
 msgid "Failed"
-msgstr ""
+msgstr "Неудалось"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:710
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:711
 msgid "Error talking to device"
 msgstr "Ошибка согласования устройства"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:711
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:712
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -4922,122 +5027,118 @@ msgstr ""
 "Была временная ошибка общения с устройством. Пожалуста, переподключите "
 "устройство или перегрузите его."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:753
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:754
 msgid "Device: "
 msgstr "Устройство: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:755
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:756
 msgid " detected."
 msgstr " определено."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:778
-msgid "Connected "
-msgstr "Подключено "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:846
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr "Отослать выбранное"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:851
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:847
 msgid "Choose format to send to device"
 msgstr "Выберите формат для отправки в устройство"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:860
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:856
 msgid "No device"
 msgstr "Нет устройства"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:857
 msgid "Cannot send: No device is connected"
 msgstr "Устройство не подсоединено"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:860
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:868
 msgid "No card"
 msgstr "Нет карточки"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:869
 msgid "Cannot send: Device has no storage card"
 msgstr "Не могу передать: в устройстве нет карты памяти"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:910
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:906
 msgid "E-book:"
 msgstr "E-book:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:913
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:909
 msgid "Attached, you will find the e-book"
 msgstr "Прикреплено, Вы найдете e-book"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:910
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:181
 msgid "by"
 msgstr "от"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:915
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:911
 msgid "in the %s format."
 msgstr "в %s формате."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:928
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:924
 msgid "Sending email to"
-msgstr "Отправка email"
+msgstr "Отправка электронной почты"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:958
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:965
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1057
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1118
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1236
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:954
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:962
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1054
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1235
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:1243
 msgid "No suitable formats"
 msgstr "Нет подходящего формата"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:959
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:955
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:966
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:963
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:984
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:981
 msgid "Failed to email books"
-msgstr "Книги не отправлены по email"
+msgstr "Книги не отправлены по электронной почте"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:985
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:982
 msgid "Failed to email the following books:"
-msgstr "Не отправлен email со следующими книгами:"
+msgstr "Не отправлена  электронная почта со следующими книгами:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:989
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:986
 msgid "Sent by email:"
-msgstr "Отослано email"
+msgstr "Отправлена электронная почта:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1016
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1013
 msgid "News:"
 msgstr "Новости:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1017
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1014
 msgid "Attached is the"
 msgstr "Прикреплено"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1028
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1025
 msgid "Sent news to"
 msgstr "Отослать новости"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1058
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1237
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1055
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1117
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1236
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1087
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1085
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1150
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1149
 msgid "Sending news to device."
 msgstr "Отправляются новости на устройство."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1202
 msgid "Sending books to device."
 msgstr "Отправка книги в устройство"
 
@@ -5087,10 +5188,10 @@ msgstr "&Следующий"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog.py:38
 msgid "My Books"
-msgstr ""
+msgstr "Мои книги"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:69
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:289
 msgid "Generate catalog"
 msgstr ""
 
@@ -5149,7 +5250,7 @@ msgstr "%(plugin_type)s %(plugins)s"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:175
 msgid "plugins"
-msgstr "плагины"
+msgstr "модули"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:184
 msgid ""
@@ -5178,7 +5279,7 @@ msgid ""
 "Email\n"
 "Delivery"
 msgstr ""
-"Email\n"
+"Электронная почта\n"
 "Доставка"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:202
@@ -5195,7 +5296,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:202
 msgid "Plugins"
-msgstr "Плагины"
+msgstr "Модули"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:220
 msgid "Auto send"
@@ -5203,185 +5304,187 @@ msgstr "Автоотправка"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:220
 msgid "Email"
-msgstr "Email"
+msgstr "Электронная почта"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:225
 msgid "Formats to email. The first matching format will be sent."
-msgstr "Форматы для отсылки. Первый подходящий формат будет отослан."
+msgstr ""
+"Форматы для отправки электронной почтой. Первый подходящий формат будет "
+"отослан."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:226
 msgid ""
 "If checked, downloaded news will be automatically mailed <br>to this email "
 "address (provided it is in one of the listed formats)."
 msgstr ""
-"Если  отмечено, то зогруженные новости будут автоматически отправлены "
-"email<br>по этому адресу (в случае если имеется один из перечисленных "
+"Если  отмечено, то загруженные новости будут автоматически отправлены <br>по "
+"этому адресу электронной почты (в случае если имеется один из перечисленных "
 "форматов)."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:300
 msgid "new email address"
-msgstr "новый  email адрес"
+msgstr "новый адрес электронной почты"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:490
 msgid "Wide"
-msgstr ""
+msgstr "Широкий"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:491
 msgid "Narrow"
-msgstr ""
+msgstr "Узкий"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:503
 msgid "System port selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:503
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:504
 msgid ""
 "The value <b>%d</b> you have chosen for the content server port is a system "
 "port. Your operating system <b>may</b> not allow the server to run on this "
 "port. To be safe choose a port number larger than 1024."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:524
 msgid "Failed to install command line tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:526
-msgid "Command line tools installed"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:527
-msgid "Command line tools installed in"
-msgstr ""
+msgid "Command line tools installed"
+msgstr "Инструменты командной строки установлены"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:528
+msgid "Command line tools installed in"
+msgstr "Инструменты командной строки установлены в"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:529
 msgid ""
 "If you move calibre.app, you have to re-install the command line tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:579
-msgid "No valid plugin path"
-msgstr "Неверный путь к плагинам"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:580
+msgid "No valid plugin path"
+msgstr "Неверный путь к модулям"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:581
 msgid "%s is not a valid plugin path"
-msgstr "%s - неверный путь к плагинам"
+msgstr "%s - неверный путь к модулям"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:584
 msgid "Choose plugin"
-msgstr "Использовать плагин"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:595
-msgid "Plugin cannot be disabled"
-msgstr "Плагин не может быть выключен"
+msgstr "Использовать модуль"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:596
-msgid "The plugin: %s cannot be disabled"
-msgstr "Плагин %s не может быть выключен"
+msgid "Plugin cannot be disabled"
+msgstr "Модуль не может быть выключен"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:605
-msgid "Plugin not customizable"
-msgstr "Плагин не настраиваемый"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:597
+msgid "The plugin: %s cannot be disabled"
+msgstr "Модуль %s не может быть выключен"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:606
-msgid "Plugin: %s does not need customization"
-msgstr "Плагин: %s не требует настройки"
+msgid "Plugin not customizable"
+msgstr "Модуль не настраиваемый"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:607
+msgid "Plugin: %s does not need customization"
+msgstr "Модуль: %s не требует настройки"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:615
 msgid "Customize"
 msgstr "Настроить"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:652
-msgid "Cannot remove builtin plugin"
-msgstr "Не могу удалить встроеный плагин"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:653
+msgid "Cannot remove builtin plugin"
+msgstr "Не могу удалить встроеный модуль"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:654
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
-" не может быть удален. Это встроенный плагин. Попробуйте отключить его."
+" не может быть удален. Это встроенный модуль. Попробуйте отключить его."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:684
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:685
 msgid "You must select a column to delete it"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:690
 msgid "The selected column is not a custom column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:690
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:691
 #: /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/config/__init__.py:691
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:692
 msgid "Do you really want to delete column %s and all its data?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:758
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:759
 msgid "Error log:"
 msgstr "Лог ошибок:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:765
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:766
 msgid "Access log:"
 msgstr "Лог доступа:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:793
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:794
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:331
 msgid "Failed to start content server"
 msgstr "Сбой запуска контент-сервера"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:817
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:818
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:587
 msgid "Select location for books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:824
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:825
 msgid "Invalid size"
 msgstr "Неверный размер"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:825
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:826
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr "Размер %s указан неверно. Должен быть задан в виде [ширина]x[высота]"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:884
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:889
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:891
 msgid "Invalid database location"
 msgstr "Неправильное расположение базы данных"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:885
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:887
 msgid "Invalid database location "
 msgstr "Неправильное расположение базы данных "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:888
 msgid "<br>Must be a directory."
 msgstr "<br>Должна быть дирректория."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:890
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:892
 msgid "Invalid database location.<br>Cannot write to "
 msgstr "Неправильное расположение базы данных.<br>Немогу записать "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:895
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:897
 msgid "Must restart"
-msgstr ""
+msgstr "Требуется перезапуск"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:896
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:898
 msgid ""
 "The changes you made require that Calibre be restarted. Please restart as "
 "soon as practical."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:930
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:932
 msgid "Checking database integrity"
 msgstr "Проверка целостности базы данных"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:950
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:952
 msgid "Failed to check database integrity"
 msgstr "Не удалось проверить целостность базы данных"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:957
 msgid "Some inconsistencies found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:956
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:958
 msgid ""
 "The following books had formats listed in the database that are not actually "
 "available. The entries for the formats have been removed. You should check "
@@ -5389,32 +5492,32 @@ msgid ""
 "folder directly."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:133
 msgid "TabWidget"
 msgstr "TabWidget"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:134
 msgid ""
 "Here you can control how calibre will read metadata from the files you add "
 "to it. calibre can either read metadata from the contents of the file, or "
 "from the filename."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:135
 msgid "Read metadata only from &file name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:136
 msgid ""
 "Swap the firstname and lastname of the author. This affects only metadata "
 "read from file names."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:137
 msgid "&Swap author firstname and lastname"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:138
 msgid ""
 "If an existing book with a similar title and author is found that does not "
 "have the format being added, the format is added\n"
@@ -5425,124 +5528,135 @@ msgid ""
 "punctuation, case, etc. Author match is exact."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:142
 msgid ""
 "If books with similar titles and authors found, &merge the new files "
 "automatically"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:143
 msgid "&Configure metadata from file name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:144
 msgid "&Adding books"
 msgstr "&Добавление книг"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:145
 msgid ""
 "Here you can control how calibre will save your books when you click the "
 "Save to Disk button:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:146
 msgid "Save &cover separately"
 msgstr "Сохранить обложку отдельно"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:147
 msgid "Update &metadata in saved copies"
 msgstr "Обновить метаданные в сохранённых копиях"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:148
 msgid "Save metadata in &OPF file"
 msgstr "Сохранить метаданные в OPF файле"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:149
 msgid "Convert non-English characters to &English equivalents"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:150
 msgid "Format &dates as:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:151
 msgid "File &formats to save:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:152
 msgid "Replace space with &underscores"
 msgstr "Заменить пробелы подчёркиваниями"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:153
 msgid "Change paths to &lowercase"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:154
 msgid "&Saving books"
-msgstr "Сохранение книг"
+msgstr "&Сохранение книг"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:135
-msgid "Preserve device collections."
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:155
+msgid "Metadata &management:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:156
+msgid "Manual management"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:157
+msgid "Only on send"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:158
+msgid "Automatic management"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:159
 msgid ""
-"If checked, collections will not be deleted even if a book with changed "
-"metadata is resent and the collection is not in the book's metadata. In "
-"addition, editing collections in the device view will be enabled. If "
-"unchecked, collections will be always reflect only the metadata in the "
-"calibre library."
+"<li><b>Manual Management</b>: Calibre updates the metadata and adds "
+"collections only when a book is sent. With this option, calibre will never "
+"remove a collection.</li>\n"
+"<li><b>Only on send</b>: Calibre updates metadata and adds/removes "
+"collections for a book only when it is sent to the device. </li>\n"
+"<li><b>Automatic management</b>: Calibre automatically keeps metadata on the "
+"device in sync with the calibre library, on every connect</li></ul>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:137
-msgid "  "
-msgstr "  "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:162
 msgid ""
 "Here you can control how calibre will save your books when you click the "
 "Send to Device button. This setting can be overriden for individual devices "
 "by customizing the device interface plugins in Preferences->Plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:163
 msgid "Sending to &device"
 msgstr "Пересылка на &устройство"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:167
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:174
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr "Настройки"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
 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/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
 msgid "Browse for the new database location"
 msgstr "Просмотреть расположение новой базы данных"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
 msgid "Show notification when &new version is available"
 msgstr "Сообщить о выходе &новой версии."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
 msgid "Download &social metadata (tags/ratings/etc.) by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
 msgid "&Overwrite author and title by default when fetching metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
 msgid "Default network &timeout:"
 msgstr "&Задержка сети по умолчанию:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
@@ -5550,213 +5664,217 @@ msgstr ""
 "Установить задержку по умолчанию для сетевых вызовов (т.е. в любое время вы "
 "выходите в интернет для получения информации)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
 msgid " seconds"
 msgstr " секунд"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
 msgid "Choose &language (requires restart):"
 msgstr "Выбрать &язык (необходим рестарт):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
 msgid "Normal"
 msgstr "Обычный"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
 msgid "High"
 msgstr "Высокий"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
 msgid "Low"
 msgstr "Низкий"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
 msgid "Job &priority:"
 msgstr "&Приоритет задачи"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
 msgid "Preferred &output format:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
 msgid "Preferred &input format order:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
 msgid "Use &Roman numerals for series number"
 msgstr "Использовать &Римские цифры для нумерации"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
 msgid "Enable system &tray icon (needs restart)"
 msgstr "использовать иконку в трее (необходим перезапуск)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
 msgid "Show &notifications in system tray"
 msgstr "Показывать уведомления в трее"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr "Показывать обложку в отдельном окне (нужен перезапуск)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
 msgid "Show &average ratings in the tags browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
 msgid "Search as you type"
 msgstr "Поиск в процессе набора"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr "Отправлять автоматически закаченные новости в устройство для чтения"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
 msgid "&Delete news from library when it is automatically sent to reader"
 msgstr ""
 "&Удалить новость из библиотеки, когда она автоматически попадает к читателю"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 "Количество обложек показываемых в режиме просмотра (нужна перезагрузка "
 "calibre)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
 msgid "Toolbar"
 msgstr "Панель инструментов"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
 msgid "Large"
 msgstr "Большой"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
 msgid "Medium"
 msgstr "Средний"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
 msgid "Small"
 msgstr "Маленький"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
 msgid "&Button size in toolbar"
 msgstr "&Размер кнопок на панеле инструментов"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
 msgid "Show &text in toolbar buttons"
 msgstr "Показать надписи на кнопках панели инструментов"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
 msgid "Select visible &columns in library view"
 msgstr "Выбрать видимые &столбцы в просмотре библиотеки"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
 msgid "Remove a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
 msgid "Add a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
 msgid "Edit settings of a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
 msgid "Use internal &viewer for:"
 msgstr "Использовать внутренний вьювер для:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
 msgid "User Interface &layout (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
 msgid "Disable &animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
+msgid "Show &donate button (restart)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
 msgid "Add an email address to which to send books"
-msgstr "Добавить email адрес получателя"
+msgstr "Добавить адрес электронной почты для отправки книг"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
 msgid "&Add email"
-msgstr "Добавить email"
+msgstr "Добавить адрес электронной почты"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
 msgid "Make &default"
 msgstr "По умолчанию"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
 msgid "&Remove email"
 msgstr "Удалить email"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
 msgid ""
 "calibre can send your books to you (or your reader) by email. Emails will be "
 "automatically sent for downloaded news to all email addresses that have Auto-"
 "send checked."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
 msgid "&Maximum number of waiting worker processes (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
 msgid "&Check database integrity"
 msgstr "Проверка целостности базы данных"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
 msgid "&Install command line tools"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
 msgid "Open calibre &configuration directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
 msgid "Limit the max. simultaneous jobs to the available CPU &cores"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
 msgid "Debug &device detection"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
 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 имеет сетевой сервер, который позволяет предоставлять доступ к "
+"Calibre имеет сетевой сервер, который позволяет предоставлять доступ к "
 "коллекции ваших книг из любой точки мира с помощью браузера. Любые изменения "
 "в настройках вступят в силу после перезапуска сервера."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
 msgid "Server &port:"
 msgstr "&Порт сервера:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:212
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:117
 msgid "&Username:"
 msgstr "&Пользователь:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:213
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:119
 msgid "&Password:"
 msgstr "&Пароль:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
@@ -5764,7 +5882,7 @@ msgstr ""
 "Если вы не установили свой пароль, то кто угодно сможет получить доступ к "
 "вашим книгам через веб-интерфейс."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
@@ -5772,45 +5890,45 @@ msgstr ""
 "Максимальный размер ([ширина]x[высота]) обложек при отображении. Более "
 "крупные обложки подгоняются по размеру. "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
 msgid "Max. &cover size:"
 msgstr "Макс. размер обложки:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:621
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:214
 msgid "&Show password"
 msgstr "&Показать пароль"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
 msgid "Max. &OPDS items per query:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
 msgid "Max. OPDS &ungrouped items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
 msgid "&Start Server"
 msgstr "&Запустить сервер"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:621
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
 msgid "St&op Server"
 msgstr "Ост&ановить сервер"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:626
 msgid "&Test Server"
 msgstr "&Проверить сервер"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
 msgid "Run server &automatically on startup"
 msgstr "Запустить сервер авт&оматически после загрузки"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:628
 msgid "View &server logs"
 msgstr "Просмотреть логи &сервера"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:46
 msgid ""
 "<p>Remember to leave calibre running as the server only runs as long as "
@@ -5821,34 +5939,34 @@ msgid ""
 "the IP address of the computer calibre is running on."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:631
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
 msgstr ""
-"Здесь можно настроить поведение Calibre, указав какие плагины он использует."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:628
-msgid "Enable/&Disable plugin"
-msgstr "Включить/Выключить плагин"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
-msgid "&Customize plugin"
-msgstr "Настроить плагин"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:630
-msgid "&Remove plugin"
-msgstr "Удалить плагин"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:631
-msgid "Add new plugin"
-msgstr "Добавить новый плагин"
+"Здесь можно настроить поведение Calibre, указав какие модули он использует"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:632
-msgid "Plugin &file:"
-msgstr "Файл плагина:"
+msgid "Enable/&Disable plugin"
+msgstr "Включить/Выключить модуль"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:633
+msgid "&Customize plugin"
+msgstr "Настроить модуль"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:634
+msgid "&Remove plugin"
+msgstr "Удалить модуль"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:635
+msgid "Add new plugin"
+msgstr "Добавить новый модуль"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:636
+msgid "Plugin &file:"
+msgstr "Файл модуля:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:638
 msgid "&Add"
 msgstr "Добавить"
 
@@ -5886,9 +6004,9 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:31
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:884
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:889
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Date"
 msgstr "Дата"
@@ -6033,7 +6151,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/device_debug.py:21
 msgid "Getting debug information"
-msgstr ""
+msgstr "Получение отладочной информации"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/device_debug.py:22
 msgid "Copy to &clipboard"
@@ -6080,18 +6198,24 @@ msgstr "Показывать это предупреждение снова"
 msgid "ERROR"
 msgstr "ОШИБКА"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:67
+msgid ""
+"All checked books will be <b>permanently deleted</b> from your device. "
+"Please verify the list."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 msgid "Location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1058
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1064
 msgid "Format"
 msgstr "Формат"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device_ui.py:50
 msgid "Delete from device"
-msgstr ""
+msgstr "Удалить из устройства"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
 msgid "Author sort"
@@ -6304,11 +6428,11 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:123
 msgid "Not a valid picture"
-msgstr ""
+msgstr "Не допустимое изображение"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:136
 msgid "Choose formats for "
-msgstr ""
+msgstr "Выберите форматы для "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:165
 msgid "No permission"
@@ -6329,7 +6453,7 @@ msgstr "Не могу прочесть метаданные"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:206
 msgid "Could not read metadata from %s format"
-msgstr "Не могу прочесть метаданные из %s формата"
+msgstr "Не могу прочесть метаданные из формата %s"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:254
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:260
@@ -6338,7 +6462,7 @@ msgstr "Не могу прочитать обложку"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:255
 msgid "Could not read cover from %s format"
-msgstr "Не могу прочитать обложку из %s"
+msgstr "Не могу прочитать обложку из формата %s"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:261
 msgid "The cover in the %s format is invalid"
@@ -6351,15 +6475,15 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:434
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:439
 msgid "This ISBN number is valid"
-msgstr ""
+msgstr "Этот номер ISBN допустим"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:442
 msgid "This ISBN number is invalid"
-msgstr ""
+msgstr "Этот номер ISBN недопустим"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:521
 msgid "Cannot use tag editor"
-msgstr ""
+msgstr "Не возможно использовать редактор тэгов"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:522
 msgid "The tags editor cannot be used if you have modified the tags"
@@ -6440,7 +6564,7 @@ msgstr "Сортировка по автору: "
 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:384
@@ -6782,7 +6906,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/select_formats.py:45
 msgid "Choose formats"
-msgstr ""
+msgstr "Выберите форматы"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:76
@@ -6792,7 +6916,7 @@ msgstr "Авторы"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:107
 msgid "Publishers"
-msgstr "Публикация"
+msgstr "Издатели"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:110
 msgid " (not on any book)"
@@ -6908,6 +7032,10 @@ msgstr ""
 msgid "Add tag to available tags and apply it to current book"
 msgstr "Добавить тег к существующим и применить его к текущей книге"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:20
+msgid "%s (was %s)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:501
 msgid "Item is blank"
@@ -6962,7 +7090,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:51
 msgid "Test email settings"
-msgstr "Проверить настройки почты"
+msgstr "Проверить настройки электронной почты"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:52
 msgid "Send test mail from %s to:"
@@ -7211,11 +7339,11 @@ msgstr "Обычный параметр (?P&lt;title&gt;)"
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:88
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:93
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:98
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:100
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:99
 msgid "No match"
 msgstr "Нет совпадений"
 
@@ -7229,7 +7357,7 @@ msgstr "Регулярное выражение (?P<author>)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124
 msgid "Series:"
-msgstr "Серия:"
+msgstr "Серии:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125
 msgid "Regular expression (?P<series>)"
@@ -7255,43 +7383,43 @@ msgstr "Обычный параметр (?P<isbn>)"
 msgid "Save single format to disk..."
 msgstr "Сохранить единый формат диска..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:53
 msgid "Edit metadata individually"
 msgstr "Редактировать метаданные индивидуально"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:56
 msgid "Edit metadata in bulk"
 msgstr "Редактировать основные метаданные"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:59
 msgid "Download metadata and covers"
 msgstr "Загрузить метаданные и обложки"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:62
 msgid "Download only metadata"
 msgstr "Загрузить только метаданные"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:64
 msgid "Download only covers"
 msgstr "Загрузить только обложки"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:67
 msgid "Download only social metadata"
 msgstr "Загрузить только социальные метаданные"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:73
 msgid "Merge into first selected book - delete others"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:76
 msgid "Merge into first selected book - keep others"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:84
 msgid "Add books from a single directory"
 msgstr "Добавить книги из одной директории"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:86
 msgid ""
 "Add books from directories, including sub-directories (One book per "
 "directory, assumes every ebook file is the same book in a different format)"
@@ -7300,7 +7428,7 @@ msgstr ""
 "директорию, считая, что каждый файл в директории - та же самая книга в "
 "разных форматах)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:90
 msgid ""
 "Add books from directories, including sub directories (Multiple books per "
 "directory, assumes every ebook file is a different book)"
@@ -7308,98 +7436,116 @@ msgstr ""
 "Добавить книги из директорий, включая поддиректории (одна книга на "
 "директорию, считая, что каждый файл - отдельная книга)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:93
 msgid "Add Empty book. (Book entry with no formats)"
-msgstr "Добавить пустую книгу (книга без каких-либо форматов)."
+msgstr "Добавить пустую книгу (книгу без каких-либо форматов)."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:102
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:160
 msgid "Save to disk"
 msgstr "Сохранить на диск"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Save to disk in a single directory"
 msgstr "Сохранить на диск в одну директорию"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:106
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:402
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:393
 msgid "Save only %s format to disk"
-msgstr "Сохранять на диск только формат %s"
+msgstr "Сохранить на диск только формат %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:110
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:396
 msgid "Save only %s format to disk in a single directory"
-msgstr ""
+msgstr "Сохранить на диск в одну директорию только в формате %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:119
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:166
 msgid "View"
 msgstr "Вид"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:121
 msgid "View specific format"
 msgstr "Просмотреть особый формат"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:127
 msgid "Remove selected books"
 msgstr "Удалить выбранные книги"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:129
 msgid "Remove files of a specific format from selected books.."
 msgstr "Удалить файлы определенного формата из выбранных книг."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:132
 msgid "Remove all formats from selected books, except..."
 msgstr "Удалить все форматы из выбранных книг, исключая..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:135
 msgid "Remove covers from selected books"
 msgstr "Удаление обложки с выбранных книг"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:138
 msgid "Remove matching books from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:155
 msgid "Convert individually"
 msgstr "Индивидуальное преобразование"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:157
 msgid "Bulk convert"
 msgstr "Общее преобразование"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:161
 msgid "Create catalog of books in your calibre library"
 msgstr "Создать каталог книг в вашей библиотеке \"calibre\""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:169
 msgid "Run welcome wizard"
-msgstr "Запустить начальный мастер настройки"
+msgstr "Запустить стартовый мастер"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:191
 msgid "Similar books..."
 msgstr "Похожие книги..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:223
 msgid "Add books to library"
-msgstr ""
+msgstr "Добавить книги к библиотеке"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:234
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:241
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:239
 msgid "Manage collections"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:328
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:319
 msgid "Cover Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:337
 msgid "Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:358
+msgid "version"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:359
+msgid "created by Kovid Goyal"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:377
+msgid "Connected "
+msgstr "Подключено "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:386
+msgid "Update found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:430
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:439
 msgid "Book Details"
 msgstr ""
 
@@ -7462,17 +7608,229 @@ msgstr "Кликнуть для просмотра списка активных
 msgid " - Jobs"
 msgstr " - Работы"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:64
+msgid ""
+"Library\n"
+"%d books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:65
+msgid ""
+"Reader\n"
+"%s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:66
+msgid ""
+"Card A\n"
+"%s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:67
+msgid ""
+"Card B\n"
+"%s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:71
+msgid "Click to see the books available on your computer"
+msgstr "Нажмите, чтобы посмотреть книги имеющиеся на вашем компьютере"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:74
+msgid "Click to see the books in the main memory of your reader"
+msgstr "Нажмите, чтобы посмотреть книги в основной памяти читалки"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:75
+msgid "Click to see the books on storage card A in your reader"
+msgstr "Нажмите, чтобы посмотреть книги на карте памяти A читалки"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:76
+msgid "Click to see the books on storage card B in your reader"
+msgstr "Нажмите, чтобы посмотреть книги на карте памяти B читалки"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:84
+msgid "Books located at"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:100
+msgid "free"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:134
+msgid ""
+"Books display will be restricted to those matching the selected saved search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:136
+msgid "Advanced search"
+msgstr "Расширенный поиск"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:141
+msgid ""
+"<p>Search the list of books by title, author, publisher, tags, comments, "
+"etc.<br><br>Words separated by spaces are ANDed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:142
+msgid "Reset Quick Search"
+msgstr "Сброс быстрого поиска"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:328
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:144
+msgid "Copy current search text (instead of search name)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:146
+msgid "Save current search under the name shown in the box"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:148
+msgid "Delete current saved search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:150
+msgid "Add books"
+msgstr "Добавить книги"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:151
+msgid "A"
+msgstr "A"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:153
+msgid "Remove books"
+msgstr "Удалить книги"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:154
+msgid "Del"
+msgstr "Del"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:406
+msgid "Edit meta info"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:406
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:156
+msgid "E"
+msgstr "E"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:157
+msgid "Merge book records"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:158
+msgid "M"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:159
+msgid "Send to device"
+msgstr "Отправить в устройство"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:161
+msgid "S"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:162
+msgid "Fetch news"
+msgstr "Скачать новости"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:163
+msgid "F"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:164
+msgid "Convert books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:165
+msgid "C"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:167
+msgid "V"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:168
+msgid "Open containing folder"
+msgstr "Открыть папку"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:169
+msgid "Show book details"
+msgstr "Показать подробности"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:170
+msgid "Books by same author"
+msgstr "Книги этого же автора"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:171
+msgid "Books in this series"
+msgstr "Книги той же серии"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:172
+msgid "Books by this publisher"
+msgstr "Книги того же издателя"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:173
+msgid "Books with the same tags"
+msgstr "Книги с такими же тегами"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:176
+msgid "Ctrl+P"
+msgstr "Ctrl+P"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:177
+msgid "Help"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:178
+msgid "Browse the calibre User Manual"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:179
+msgid "F1"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:284
 msgid "N"
-msgstr ""
+msgstr "Н"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:284
 msgid "Y"
-msgstr ""
+msgstr "Д"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66
 msgid "On Device"
-msgstr ""
+msgstr "На устройстве"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68
 msgid "Size (MB)"
@@ -7480,32 +7838,32 @@ msgstr "Размер (МБ)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71
 msgid "Rating"
-msgstr "Рейтинг"
+msgstr "Оценка"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:324
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1084
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr "Книга <font face=\"serif\">%s</font> из %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:674
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1176
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1182
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:886
 msgid "In Library"
-msgstr ""
+msgstr "В Библиотеке"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:885
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:890
 msgid "Size"
-msgstr ""
+msgstr "Размер"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1156
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1162
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1165
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr "Дважды кликните по <b>редактировать</b><br><br>"
 
@@ -7519,11 +7877,11 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:116
 msgid "Ascending"
-msgstr ""
+msgstr "Возрастание"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:119
 msgid "Descending"
-msgstr ""
+msgstr "Убывание"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:131
 msgid "Change text alignment for %s"
@@ -7549,11 +7907,11 @@ msgstr ""
 msgid "Restore default layout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:524
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:525
 msgid "Not allowed"
 msgstr "Запрещено"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:526
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
@@ -7752,155 +8110,34 @@ msgstr "попробуйте перезагрузить ваш компьюте
 msgid "try deleting the file"
 msgstr "попробуйте удалить файл"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:131
 msgid "calibre"
 msgstr "calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:133
 msgid "&Restrict to:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
-msgid ""
-"Books display will be restricted to those matching the selected saved search"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:135
 msgid "set in ui.py"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
-msgid "Advanced search"
-msgstr "Расширенный поиск"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:138
 msgid "Alt+S"
 msgstr "Alt+S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:139
 msgid "&Search:"
 msgstr "&Поиск:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
-msgid ""
-"<p>Search the list of books by title, author, publisher, tags, comments, "
-"etc.<br><br>Words separated by spaces are ANDed"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
-msgid "Reset Quick Search"
-msgstr "Сброс быстрого поиска"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
-msgid "Choose saved search or enter name for new saved search"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
-msgid "Copy current search text (instead of search name)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
-msgid "Save current search under the name shown in the box"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
-msgid "Delete current saved search"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
-msgid "Add books"
-msgstr "Добавить книги"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
-msgid "A"
-msgstr "A"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
-msgid "Remove books"
-msgstr "Удалить книги"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
-msgid "Del"
-msgstr "Del"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:155
 msgid "Edit meta information"
 msgstr "Редактировать мета информацию"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
-msgid "E"
-msgstr "E"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
-msgid "Merge book records"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
-msgid "M"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
-msgid "Send to device"
-msgstr "Отправить в устройство"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
-msgid "S"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
-msgid "Fetch news"
-msgstr "Скачать новости"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
-msgid "F"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
-msgid "Convert E-books"
-msgstr "Конвертировать"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
-msgid "C"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
-msgid "V"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
-msgid "Open containing folder"
-msgstr "Открыть папку"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
-msgid "Show book details"
-msgstr "Показать подробности"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
-msgid "Books by same author"
-msgstr "Книги этого же автора"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
-msgid "Books in this series"
-msgstr "Книги той же серии"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
-msgid "Books by this publisher"
-msgstr "Книги того же издателя"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
-msgid "Books with the same tags"
-msgstr "Книги с такими же тегами"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:175
 msgid "Configure calibre"
 msgstr "Конфигурация Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
-msgid "Ctrl+P"
-msgstr "Ctrl+P"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:20
 msgid ""
 "Redirect console output to a dialog window (both stdout and stderr). Useful "
@@ -7930,32 +8167,41 @@ msgstr "У книги нет ни названия, ни ISBN"
 msgid "No matches found for this book"
 msgstr "Нет совпадений в этой книге"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:91
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:553
 msgid "Search"
 msgstr "Найти"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:313
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:315
 msgid "The selected search will be <b>permanently deleted</b>. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:357
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr "Поиск (для расширенного поиска нажмите кнопку слева)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:392
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:398
 msgid "Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:406
+msgid "Choose saved search or enter name for new saved search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:10
+msgid "Restrict to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:48
 msgid "({0} of {1})"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
 msgid "(all books)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:56
 msgid "({0} of all)"
 msgstr ""
 
@@ -7974,7 +8220,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:131
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:223
 msgid " or "
-msgstr ""
+msgstr " или "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:133
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:69
@@ -8068,28 +8314,41 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:768
 msgid "Sort by name"
-msgstr ""
+msgstr "Сортировать по имени"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:768
 msgid "Sort by popularity"
-msgstr ""
+msgstr "Сортировать по популярности"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:769
 msgid "Sort by average rating"
+msgstr "Сортировать по средней оценке"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:772
+msgid "Set the sort order for entries in the Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:775
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:778
 msgid "Match all"
 msgstr "Сравнить все"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:775
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:778
 msgid "Match any"
 msgstr "Сравнить некоторые"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:783
+msgid ""
+"When selecting multiple entries in the Tag Browser match any or all of them"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:787
 msgid "Manage &user categories"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:790
+msgid "Add your own categories to the Tag Browser"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182
 msgid "Convert book %d of %d (%s)"
@@ -8115,15 +8374,15 @@ msgstr ""
 msgid "Queueing "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:239
 msgid "Fetch news from "
 msgstr "Выбрать новости из "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:301
 msgid "Convert existing"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:302
 msgid ""
 "The following books have already been converted to %s format. Do you wish to "
 "reconvert them?"
@@ -8137,91 +8396,84 @@ msgstr "Восстановить"
 msgid "&Donate to support calibre"
 msgstr "Пожертвовать на развитие calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:168
 msgid "&Eject connected device"
-msgstr ""
+msgstr "Извлечь подключенное устройство"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:173
 msgid "&Restart"
 msgstr "&Перезапуск"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:206
-msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
-msgstr ""
-"<p>Для получения справки см.:<a href=\"%s\">Руководство пользователя </><br>"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:212
-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/ui.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:227
 msgid "Calibre Quick Start Guide"
-msgstr ""
+msgstr "Руководство по быстрому началу работы с Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:389
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:380
 msgid "Cannot configure"
 msgstr "Невозможно настроить"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:376
 msgid "Cannot configure while there are running jobs."
 msgstr "Пока запущено задание, не могу настроить"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:381
 msgid "Cannot configure before calibre is restarted."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:424
 msgid "No detailed info available"
 msgstr "Нет доступной подробной информации"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:425
 msgid "No detailed information is available for books on the device."
 msgstr "Не доступна подробная информация книг на устройстве"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:486
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr "Ошибка преобразования"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:487
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:478
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using third party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:491
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:506
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:546
 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."
+"you find it useful, please consider donating to support its development. "
+"Your donation helps keep calibre development going."
 msgstr ""
-"является результато труда многих добровольцев по всему миру. Если Вы сочли "
-"его полезным, будьте добры пожертвовать на его развитие."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:572
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr "Имеется активное задание. Вы все равно хотите выйти?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:575
 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 ""
+" установлена связь с устройством!<br>\n"
+"                      Выход может вызвать искажение на устройстве.<br>\n"
+"                      Вы действительно уверены, что хотите выйти?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:579
 msgid "WARNING: Active jobs"
 msgstr "ПРЕДУПРЕЖДЕНИЕ: Активные задания"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:640
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:632
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -8229,19 +8481,11 @@ msgstr ""
 "продолжит работать в трее. Для завершения работы выберите<b>Quit</b> в "
 "контекстном меню трея."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/update.py:52
-msgid ""
-"<span style=\"color:red; font-weight:bold\">Latest version: <a "
-"href=\"%s\">%s</a></span>"
-msgstr ""
-"<span style=\"color:red; font-weight:bold\">Последняя версия: <a "
-"href=\"%s\">%s</a></span>"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/update.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:56
 msgid "Update available"
 msgstr "Доступно обновление"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/update.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:57
 msgid ""
 "%s has been updated to version %s. See the <a href=\"http://calibre-"
 "ebook.com/whats-new\">new features</a>. Visit the download page?"
@@ -8432,7 +8676,7 @@ msgstr "Текст, разделённый дифисом"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:51
 msgid "Default language for hyphenation rules"
-msgstr ""
+msgstr "Язык по умолчанию для правил расстановки переносов"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:53
 msgid "Font options"
@@ -8473,27 +8717,27 @@ msgstr "Перейти..."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:467
 msgid "Next Section"
-msgstr ""
+msgstr "Следующий раздел"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:468
 msgid "Previous Section"
-msgstr ""
+msgstr "Предыдущий раздел"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:470
 msgid "Document Start"
-msgstr ""
+msgstr "Начало документа"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:471
 msgid "Document End"
-msgstr ""
+msgstr "Конец документа"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:473
 msgid "Section Start"
-msgstr ""
+msgstr "Начало раздела"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:474
 msgid "Section End"
-msgstr ""
+msgstr "Конец раздела"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:12
 msgid "Scroll to the next page"
@@ -8545,7 +8789,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:115
 msgid "Book format"
-msgstr ""
+msgstr "Формат книги"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:184
 msgid "Position in book"
@@ -8713,105 +8957,45 @@ msgstr ""
 msgid "Print eBook"
 msgstr "Печать книги"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
 msgid "Copy Image"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:240
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:239
 msgid "Paste Image"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:270
-msgid ""
-"Library\n"
-"%d\n"
-"books"
-msgstr ""
-"Библиотека\n"
-"%d\n"
-"книг"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:271
-msgid ""
-"Reader\n"
-"%s\n"
-"available"
-msgstr ""
-"Ридер\n"
-"%s\n"
-"доступно"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:272
-msgid ""
-"Card A\n"
-"%s\n"
-"available"
-msgstr ""
-"Карта A\n"
-"%s\n"
-"доступна"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:273
-msgid ""
-"Card B\n"
-"%s\n"
-"available"
-msgstr ""
-"Карта B\n"
-"%s\n"
-"доступна"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:277
-msgid "Click to see the books available on your computer"
-msgstr "Нажмите, чтобы посмотреть книги имеющиеся на вашем компьютере"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:280
-msgid "Click to see the books in the main memory of your reader"
-msgstr "Нажмите, чтобы посмотреть книги в основной памяти читалки"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:281
-msgid "Click to see the books on storage card A in your reader"
-msgstr "Нажмите, чтобы посмотреть книги на карте памяти A читалки"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:282
-msgid "Click to see the books on storage card B in your reader"
-msgstr "Нажмите, чтобы посмотреть книги на карте памяти B читалки"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:290
-msgid "Books located at"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:364
 msgid "Change Case"
 msgstr "Изменить регистр"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:365
 msgid "Upper Case"
 msgstr "Верхний регистр"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:366
 msgid "Lower Case"
 msgstr "Нижний регистр"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:367
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:368
 msgid "Title Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:974
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:837
 msgid "Drag to resize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:869
 msgid "Show"
-msgstr ""
+msgstr "Показать"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1012
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:876
 msgid "Hide"
-msgstr ""
+msgstr "Скрыть"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:367
 msgid ""
@@ -8867,7 +9051,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/library_ui.py:50
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:42
 msgid "Welcome to calibre"
-msgstr ""
+msgstr "Добро пожаловать в Сalibre"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/device_ui.py:50
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/finish_ui.py:47
@@ -8972,23 +9156,24 @@ msgstr "Плохая конфигурация"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:124
 msgid "You must set the From email address"
-msgstr "Нужно указать From email адрес"
+msgstr "Вы должны указать в поле \"От\" адреса электронной почты"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:131
 msgid "You must set the username and password for the mail server."
-msgstr "Нжно указать имя пользователя и пароль для email сервера"
+msgstr ""
+"Вы должны указать имя пользователя и пароль для сервера электронной почты"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:108
 msgid "Send email &from:"
-msgstr "Отослать email &from:"
+msgstr "Отправить электронную почту от:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:109
 msgid ""
 "<p>This is what will be present in the From: field of emails sent by "
 "calibre.<br> Set it to your email address"
 msgstr ""
-"<p>То, что будет указано в поле From:  письма, отсылаемого calibre.<br> "
-"Проставьте Ваш email адрес"
+"<p>То, что будет указано в поле \"От\":  письма, отсылаемого calibre.<br> "
+"Проставьте адрес вашей электронной почты"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:110
 msgid ""
@@ -9013,7 +9198,7 @@ msgstr "Имя хоста:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:114
 msgid "The hostname of your mail server. For e.g. smtp.gmail.com"
-msgstr "TИмя хоста почтового сервера. Напимер smtp.gmail.com"
+msgstr "Имя хоста почтового сервера. Напимер smtp.gmail.com"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:115
 msgid "&Port:"
@@ -9076,7 +9261,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:45
 msgid "Turn on the &content server"
-msgstr ""
+msgstr "Включить &сервер информационного наполнения"
 
 #: /home/kovid/work/calibre/src/calibre/library/caches.py:230
 msgid "today"
@@ -9084,16 +9269,16 @@ msgstr "сегодня"
 
 #: /home/kovid/work/calibre/src/calibre/library/caches.py:233
 msgid "yesterday"
-msgstr ""
+msgstr "вчера"
 
 #: /home/kovid/work/calibre/src/calibre/library/caches.py:236
 msgid "thismonth"
-msgstr "В этом месяце"
+msgstr "в этом месяце"
 
 #: /home/kovid/work/calibre/src/calibre/library/caches.py:239
 #: /home/kovid/work/calibre/src/calibre/library/caches.py:240
 msgid "daysago"
-msgstr ""
+msgstr "несколько дней назад"
 
 #: /home/kovid/work/calibre/src/calibre/library/caches.py:398
 #: /home/kovid/work/calibre/src/calibre/library/caches.py:408
@@ -9121,7 +9306,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/library/caches.py:405
 msgid "empty"
-msgstr ""
+msgstr "пусто"
 
 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:41
 msgid ""
@@ -9344,7 +9529,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:282
 msgid "Add an empty book (a book with no formats)"
-msgstr ""
+msgstr "Добавить пустую книгу (книгу без форматов)"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:284
 msgid "Set the title of the added empty book"
@@ -9608,7 +9793,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:772
 msgid "y"
-msgstr ""
+msgstr "д"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:778
 msgid ""
@@ -9678,15 +9863,15 @@ msgstr "Сжатие базы данных"
 
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:1909
 msgid "Checking SQL integrity..."
-msgstr ""
+msgstr "Проверка целостности SQL..."
 
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:1950
 msgid "Checking for missing files."
-msgstr ""
+msgstr "Проверка недостающих файлов."
 
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:1972
 msgid "Checked id"
-msgstr ""
+msgstr "Проверенный ID"
 
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:118
 msgid "Ratings"
@@ -9742,11 +9927,11 @@ msgstr "Дата публикации"
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:38
 msgid "The calibre internal id"
-msgstr ""
+msgstr "Внутренний идинтификатор calibre"
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:48
 msgid "Options to control saving to disk"
-msgstr ""
+msgstr "Опции, чтобы управлять сохранением на диск"
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:54
 msgid ""
@@ -9804,7 +9989,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:87
 msgid "Convert paths to lowercase."
-msgstr ""
+msgstr "Преобразовать пути в нижний регистр."
 
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:89
 msgid "Replace whitespace with underscores."
@@ -9887,23 +10072,23 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:144
 msgid "RATING: %s<br />"
-msgstr ""
+msgstr "ОЦЕНКИ: %s<br />"
 
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:147
 msgid "TAGS: %s<br />"
-msgstr ""
+msgstr "ТЕГИ: %s<br />"
 
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:151
 msgid "SERIES: %s [%s]<br />"
-msgstr ""
+msgstr "Серии: %s [%s]<br />"
 
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:192
 msgid "Library"
-msgstr ""
+msgstr "Библиотека"
 
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:231
 msgid "Books in your library"
-msgstr ""
+msgstr "Книги в вашей библиотеке"
 
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:237
 msgid "By "
@@ -9911,11 +10096,11 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:238
 msgid "Books sorted by "
-msgstr ""
+msgstr "Книги, сортированные "
 
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Newest"
-msgstr ""
+msgstr "Самый новый"
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:48
 msgid "%sUsage%s: %s\n"
@@ -9977,7 +10162,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:694
 msgid "Add new formats to existing book records"
-msgstr ""
+msgstr "Добавить новые форматы к существующим записям книг"
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:699
 msgid "List of named saved searches"
@@ -9985,10 +10170,10 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:700
 msgid "User-created tag browser categories"
-msgstr ""
+msgstr "Разработанные пользователем тэги браузера категорий"
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:702
-msgid "Preserve all collections even if not in library metadata."
+msgid "How and when calibre updates metadata on the device."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:43
@@ -10033,27 +10218,27 @@ msgstr "Английский"
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:99
 msgid "English (Australia)"
-msgstr ""
+msgstr "Английский язык (Австралия)"
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:100
 msgid "English (New Zealand)"
-msgstr ""
+msgstr "Английский язык (Новая Зеландия)"
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:101
 msgid "English (Canada)"
-msgstr ""
+msgstr "Английский язык (Канада)"
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:102
 msgid "English (India)"
-msgstr ""
+msgstr "Английский язык (Индия)"
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:103
 msgid "English (Thailand)"
-msgstr ""
+msgstr "Английский язык (Таиланд)"
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:104
 msgid "English (Cyprus)"
-msgstr ""
+msgstr "Английский язык (Кипр)"
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:105
 msgid "English (Pakistan)"
@@ -10061,7 +10246,7 @@ msgstr "Английский (Пакистан)"
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:106
 msgid "English (Israel)"
-msgstr ""
+msgstr "Английский язык (Израиль)"
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:107
 msgid "English (Singapore)"
@@ -10069,31 +10254,31 @@ msgstr "Английский (Сингапур)"
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:108
 msgid "English (Yemen)"
-msgstr ""
+msgstr "Английский язык (Йемен)"
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:109
 msgid "English (Ireland)"
-msgstr ""
+msgstr "Английский язык (Ирландия)"
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:110
 msgid "English (China)"
-msgstr ""
+msgstr "Английский язык (Китай)"
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:111
 msgid "Spanish (Paraguay)"
-msgstr ""
+msgstr "Испанский язык (Парагвай)"
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:112
 msgid "German (AT)"
-msgstr ""
+msgstr "Немецкий язык (AT)"
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:113
 msgid "Dutch (NL)"
-msgstr ""
+msgstr "Нидерландский язык (NL)"
 
 #: /home/kovid/work/calibre/src/calibre/utils/localization.py:114
 msgid "Dutch (BE)"
-msgstr ""
+msgstr "Нидерландский язык (BE)"
 
 #: /home/kovid/work/calibre/src/calibre/utils/sftp.py:53
 msgid "URL must have the scheme sftp"
@@ -10113,7 +10298,7 @@ msgstr "Ошибка авторизации на сервере: %s"
 
 #: /home/kovid/work/calibre/src/calibre/utils/smtp.py:234
 msgid "Control email delivery"
-msgstr "Контроль email доставки"
+msgstr "Контроль доставки электронной почты"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:118
 #: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:140
@@ -10158,93 +10343,97 @@ msgstr "Неизвестный новостной ресурс"
 msgid "The \"%s\" recipe needs a username and password."
 msgstr "Рецепт \"%s\" требует имя пользожателя и пароль"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:706
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:708
 msgid "Download finished"
 msgstr "Закачка завершена"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:708
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:710
 msgid "Failed to download the following articles:"
 msgstr "Неудачная загрузка следующих статей:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:714
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:716
 msgid "Failed to download parts of the following articles:"
 msgstr "Неудачная загрузка частей следующих статей:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:716
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:718
 msgid " from "
 msgstr " из "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:718
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:720
 msgid "\tFailed links:"
 msgstr "\tБитые ссылки:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:807
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:809
 msgid "Could not fetch article. Run with -vv to see the reason"
 msgstr "Не может быть вызвана статья. Запустите с -w чтобы увидеть причину."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:828
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:830
 msgid "Fetching feeds..."
 msgstr "Вызываются заготовки..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:833
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:835
 msgid "Got feeds from index page"
 msgstr "Получить заготовки для оглавления"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:839
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:841
 msgid "Trying to download cover..."
 msgstr "Попытка скачать обложку..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:841
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Generating masthead..."
 msgstr "Создаем титульные данные..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:922
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:924
 msgid "Starting download [%d thread(s)]..."
 msgstr "Начало загрузки [%d поток(и)]..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:938
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:940
 msgid "Feeds downloaded to %s"
 msgstr "Заготовки закачиватся в %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:948
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:950
 msgid "Could not download cover: %s"
 msgstr "Невозможно скачать обложку: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:960
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
 msgid "Downloading cover from %s"
 msgstr "Скачивается обложка из %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1002
 msgid "Masthead image downloaded"
 msgstr "Выходные данные изображения загрузили"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1190
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1192
 msgid "Untitled Article"
 msgstr "Статья без названия"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1261
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1263
 msgid "Article downloaded: %s"
 msgstr "Статья скачена: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1272
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1274
 msgid "Article download failed: %s"
 msgstr "Ошибка загрузки статьи: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1289
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1291
 msgid "Fetching feed"
 msgstr "Доставляется материал"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1436
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1438
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
 msgstr ""
+"Не удалось выполнить вход, проверьте свое имя пользователя и пароль для "
+"службы Периодических изданий Calibre."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1452
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1454
 msgid ""
 "You do not have permission to download this issue. Either your subscription "
 "has expired or you have exceeded the maximum allowed downloads for today."
 msgstr ""
+"У вас нет разрешения загрузить этот выпуск. Или ваша подписка истекла, или "
+"вы превысили максимальную позволенную загрузку на сегодня."
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/collection.py:47
 msgid "You"
@@ -11453,6 +11642,9 @@ msgstr "Не скачивать файлы стилей CSS."
 #~ msgstr ""
 #~ "<p>Книги с таким названием уже есть в библиотеки. Всеравно добавить?<ul>"
 
+#~ 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>"
+
 #~ msgid ""
 #~ "<p>For help visit <a "
 #~ "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
@@ -11869,6 +12061,13 @@ msgstr "Не скачивать файлы стилей CSS."
 #~ msgid "Could not access %s. Using %s as the library."
 #~ msgstr "Нет доступа к %s. Использование %s в качестве библиотеки."
 
+#~ 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 ""
+#~ "является результато труда многих добровольцев по всему миру. Если Вы сочли "
+#~ "его полезным, будьте добры пожертвовать на его развитие."
+
 #~ msgid ""
 #~ " is communicating with the device!<br>\n"
 #~ "                      'Quitting may cause corruption on the device.<br>\n"
@@ -11878,6 +12077,13 @@ msgstr "Не скачивать файлы стилей CSS."
 #~ "                      'Выход может повредить устройство.<br>\n"
 #~ "                      'Желаете выйти?"
 
+#~ msgid ""
+#~ "<span style=\"color:red; font-weight:bold\">Latest version: <a "
+#~ "href=\"%s\">%s</a></span>"
+#~ msgstr ""
+#~ "<span style=\"color:red; font-weight:bold\">Последняя версия: <a "
+#~ "href=\"%s\">%s</a></span>"
+
 #~ msgid ""
 #~ "%s has been updated to version %s. See the <a "
 #~ "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">new features</a>. "
@@ -11911,6 +12117,9 @@ msgstr "Не скачивать файлы стилей CSS."
 #~ "Использовать список книг по названию, автору, издателю, тэгам и "
 #~ "комментариям<br><br>Слова разделены пробелами и объединены AND"
 
+#~ msgid "Convert E-books"
+#~ msgstr "Конвертировать"
+
 #~ msgid "Click to browse books by their covers"
 #~ msgstr "Кликнуть для просмотра книг по обложкам"
 
@@ -11943,6 +12152,24 @@ msgstr "Не скачивать файлы стилей CSS."
 #~ msgid "Ebook Viewer"
 #~ msgstr "Ebook вьювер"
 
+#~ msgid ""
+#~ "Library\n"
+#~ "%d\n"
+#~ "books"
+#~ msgstr ""
+#~ "Библиотека\n"
+#~ "%d\n"
+#~ "книг"
+
+#~ msgid ""
+#~ "Reader\n"
+#~ "%s\n"
+#~ "available"
+#~ msgstr ""
+#~ "Ридер\n"
+#~ "%s\n"
+#~ "доступно"
+
 #~ msgid ""
 #~ "Card\n"
 #~ "%s\n"
@@ -12288,6 +12515,24 @@ msgstr "Не скачивать файлы стилей CSS."
 #~ "<h2>Руководство пользователя</h2>Руководство пользователя также доступно <a "
 #~ "href=\"http://calibre.kovidgoyal.net/user_manual\">онлайн</a>."
 
+#~ msgid ""
+#~ "Card A\n"
+#~ "%s\n"
+#~ "available"
+#~ msgstr ""
+#~ "Карта A\n"
+#~ "%s\n"
+#~ "доступна"
+
+#~ msgid ""
+#~ "Card B\n"
+#~ "%s\n"
+#~ "available"
+#~ msgstr ""
+#~ "Карта B\n"
+#~ "%s\n"
+#~ "доступна"
+
 #~ msgid "Do not add a blank line between paragraphs."
 #~ msgstr "Не добавлять пустую строку между абзацами."
 
@@ -12369,8 +12614,12 @@ msgstr "Не скачивать файлы стилей CSS."
 #~ msgid "Send specific format to storage card A"
 #~ msgstr "Отправить определённый формат на карту памяти A"
 
+#~ msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
+#~ msgstr ""
+#~ "<p>Для получения справки см.:<a href=\"%s\">Руководство пользователя </><br>"
+
 #~ msgid "&Transliterate unicode characters to ASCII."
 #~ msgstr "Транслитерировать Unicode символы в ASCII."
 
-#~ msgid "Communicate with iBooks through iTunes."
-#~ msgstr "Связывать с iBooks через iTunes."
+#~ msgid "  "
+#~ msgstr "  "
diff --git a/src/calibre/translations/sq.po b/src/calibre/translations/sq.po
index e68564bd66..05eec01060 100644
--- a/src/calibre/translations/sq.po
+++ b/src/calibre/translations/sq.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-07-03 01:21+0000\n"
-"PO-Revision-Date: 2010-07-02 18:22+0000\n"
+"POT-Creation-Date: 2010-07-09 22:00+0000\n"
+"PO-Revision-Date: 2010-07-09 20:34+0000\n"
 "Last-Translator: Besnik <besnik@programeshqip.org>\n"
 "Language-Team: Albanian <sq@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: 2010-07-03 03:43+0000\n"
+"X-Launchpad-Export-Date: 2010-07-10 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
@@ -27,10 +27,10 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:71
 #: /home/kovid/work/calibre/src/calibre/devices/prs500/books.py:267
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:466
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:492
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:396
-#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:98
-#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:101
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:97
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:100
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/metadata.py:56
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:428
 #: /home/kovid/work/calibre/src/calibre/ebooks/fb2/input.py:67
@@ -72,9 +72,9 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:818
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:49
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:51
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:910
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:915
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:981
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:911
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:916
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:982
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:137
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:139
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:108
@@ -102,20 +102,20 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:233
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:290
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:815
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:818
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:814
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:817
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:172
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:179
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:22
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:135
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:903
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:912
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1192
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1195
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:898
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:907
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1190
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1193
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:120
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:155
@@ -123,8 +123,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:172
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:362
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:877
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1054
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:882
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1060
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:87
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:92
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:185
@@ -170,69 +170,69 @@ msgstr ""
 msgid "Catalog generator"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:15
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:16
 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:51
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:52
 msgid ""
 "Character encoding for the input HTML files. Common choices include: cp1252, "
 "latin1, iso-8859-1 and utf-8."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:58
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:59
 msgid ""
 "Create a PMLZ archive containing the PML file and all images in the "
 "directory pmlname_img or images. This plugin is run every time you add a PML "
 "file to the library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:90
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:93
 msgid "Extract cover from comic files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:117
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:128
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:140
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:150
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:160
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:171
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:181
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:191
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:201
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:211
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:221
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:232
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:243
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:255
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:276
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:287
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:297
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:307
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:120
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:131
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:153
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:163
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:174
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:184
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:194
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:204
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:214
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:224
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:235
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:246
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:258
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:279
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:290
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:300
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:310
 msgid "Read metadata from %s files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:266
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:269
 msgid "Read metadata from ebooks in RAR archives"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:318
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:321
 msgid "Read metadata from ebooks in ZIP archives"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:331
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:341
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:351
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:373
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:384
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:394
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:334
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:344
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:354
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:376
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:387
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:397
 msgid "Set metadata in %s files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:362
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:365
 msgid "Set metadata from %s files"
 msgstr ""
 
@@ -376,35 +376,35 @@ msgstr ""
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:31
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
 msgid "Installed plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:33
 msgid "Mapping for filetype plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:33
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:34
 msgid "Local plugin customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:34
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
 msgid "Disabled plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
 msgid "Enabled plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:83
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:84
 msgid "No valid plugin found in "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:460
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:468
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:493
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
 msgid ""
 "    %prog options\n"
 "\n"
@@ -412,29 +412,29 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:499
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:503
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:511
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:505
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:513
 msgid "List all installed plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Enable the named plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Disable the named plugin"
 msgstr ""
 
@@ -585,7 +585,7 @@ msgstr ""
 msgid "Communicate with the BOOX eBook reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:121
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:123
 msgid ""
 "Comma separated list of directories to send e-books to on the device. The "
 "first one that exists will be used."
@@ -656,7 +656,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:51
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:54
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:57
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:157
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:159
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:64
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:67
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:70
@@ -666,22 +666,22 @@ msgstr ""
 msgid "Getting list of books on device..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:218
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:258
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:219
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:263
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:244
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:262
 msgid "Removing books from device..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:262
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:269
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:267
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:274
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:269
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:274
 msgid "Removing books from device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:274
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:308
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:313
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:208
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:238
 msgid "Adding books to device metadata listing..."
@@ -699,6 +699,10 @@ msgstr ""
 msgid "Communicate with the Sweex MM300"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/misc.py:75
+msgid "Communicate with the Pandigital Novel"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:17
 msgid "Communicate with the Nokia 770 internet tablet."
 msgstr ""
@@ -1454,6 +1458,51 @@ msgstr ""
 msgid "Creating"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/__init__.py:18
+msgid "ePub Fixer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/epubcheck.py:18
+msgid "Workaround epubcheck bugs"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/epubcheck.py:22
+msgid ""
+"Workarounds for bugs in the latest release of epubcheck. epubcheck reports "
+"many things as errors that are not actually errors. %prog will try to detect "
+"these and replace them with constructs that epubcheck likes. This may cause "
+"significant changes to your epub, complain to the epubcheck project."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:19
+msgid ""
+"%prog [options] file.epub\n"
+"\n"
+"Fix common problems in EPUB files that can cause them to be rejected by "
+"poorly designed publishing services.\n"
+"\n"
+"By default, no fixing is done and messages are printed out for each error "
+"detected. Use the options to control which errors are automatically fixed."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:50
+msgid "You must specify an epub file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:17
+msgid "Fix unmanifested files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:21
+msgid ""
+"Fix unmanifested files. %prog can either add them to the manifest or delete "
+"them as specified by the delete unmanifested option."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:32
+msgid "Delete unmanifested files instead of adding them to the manifest"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:56
 msgid ""
 "Extract the contents of the generated EPUB file to the specified directory. "
@@ -1762,11 +1811,11 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:98
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:882
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:887
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:543
 msgid "Title"
 msgstr "Titull"
@@ -1775,7 +1824,7 @@ msgstr "Titull"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:364
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:883
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:888
 msgid "Author(s)"
 msgstr "Autor(ë)"
 
@@ -1798,7 +1847,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:67
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:318
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1073
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1079
 msgid "Comments"
 msgstr "Komente"
 
@@ -1807,7 +1856,7 @@ msgstr "Komente"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:306
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1069
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1075
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:139
 msgid "Tags"
 msgstr "Etiketa"
@@ -1817,7 +1866,7 @@ msgstr "Etiketa"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:323
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1084
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:87
 msgid "Series"
 msgstr "Seri"
@@ -1827,7 +1876,7 @@ msgid "Language"
 msgstr "Gjuhë"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:406
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1067
 msgid "Timestamp"
 msgstr "Vulë kohore"
 
@@ -2052,7 +2101,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1226
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1398
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1399
 msgid "Cover"
 msgstr "Kapak"
 
@@ -2091,70 +2140,70 @@ msgstr "Krejt artikujt"
 msgid "This is an Amazon Topaz book. It cannot be processed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1399
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1400
 msgid "Title Page"
 msgstr "Faqe Titulli"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1400
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1401
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:15
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:53
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:194
 msgid "Table of Contents"
 msgstr "Tryeza e Lëndës"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1401
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1402
 msgid "Index"
 msgstr "Tregues"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1402
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1403
 msgid "Glossary"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1403
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1404
 msgid "Acknowledgements"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1404
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1405
 msgid "Bibliography"
 msgstr "Bibliografi"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1405
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1406
 msgid "Colophon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1406
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1407
 msgid "Copyright"
 msgstr "Të drejta kopjimi"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1407
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1408
 msgid "Dedication"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1408
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1409
 msgid "Epigraph"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1409
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1410
 msgid "Foreword"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1410
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1411
 msgid "List of Illustrations"
 msgstr "Listë e ilustrimeve"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1411
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1412
 msgid "List of Tables"
 msgstr "Listë Tabelash"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1412
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1413
 msgid "Notes"
 msgstr "Shënime"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1413
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1414
 msgid "Preface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1414
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1415
 msgid "Main Text"
 msgstr "Teksti Kryesor"
 
@@ -2198,7 +2247,7 @@ msgstr "Anështyllë"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:22
 #: /home/kovid/work/calibre/src/calibre/ebooks/tcr/input.py:23
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:23
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:24
 msgid ""
 "Normally calibre treats blank lines as paragraph markers. With this option "
 "it will assume that every line represents a paragraph instead."
@@ -2206,7 +2255,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:26
 #: /home/kovid/work/calibre/src/calibre/ebooks/tcr/input.py:27
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:27
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:28
 msgid ""
 "Normally calibre treats blank lines as paragraph markers. With this option "
 "it will assume that every line starting with an indent (either a tab or 2+ "
@@ -2335,7 +2384,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
 msgid "Author"
 msgstr ""
@@ -2470,19 +2519,19 @@ msgid ""
 "slowest."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:33
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:34
 msgid ""
 "Normally extra spaces are condensed into a single space. With this option "
 "all spaces will be displayed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:36
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:37
 msgid ""
 "Run the text input through the markdown pre-processor. To learn more about "
 "markdown see"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:39
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:40
 msgid "Do not insert a Table of Contents into the output text."
 msgstr ""
 
@@ -2644,7 +2693,7 @@ msgstr ""
 msgid "Copy to Clipboard"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:400
 msgid "Choose Files"
 msgstr ""
 
@@ -2659,13 +2708,13 @@ msgid "User annotations generated from main library only"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:75
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:612
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:671
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:708
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:729
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:877
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1060
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:670
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:707
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:728
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:876
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:941
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1059
 msgid "No books selected"
 msgstr ""
 
@@ -2705,209 +2754,209 @@ msgstr ""
 msgid "How many empty books should be added?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:340
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:390
 msgid "Uploading books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:350
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:137
 msgid "Books"
 msgstr "Libra"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
 msgid "EPUB Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
 msgid "LRF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
 msgid "HTML Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
 msgid "LIT Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
 msgid "MOBI Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
 msgid "Topaz books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
 msgid "Text books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:359
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
 msgid "PDF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:359
 msgid "Comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:360
 msgid "Archives"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:364
 msgid "Supported books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:399
 msgid "Merged some books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:401
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:400
 msgid ""
 "Some duplicates were found and merged into the following existing books:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:409
 msgid "Failed to read metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:410
 msgid "Failed to read metadata from the following"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:434
 msgid "Add to library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:460
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1229
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:459
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1228
 msgid "No book selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:434
 msgid "No book files found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:456
 msgid "Cannot delete"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:469
 msgid "Choose formats to be deleted"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:488
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:487
 msgid "Choose formats <b>not</b> to be deleted"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:507
 msgid "Cannot delete books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:509
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:508
 msgid "No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:519
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:518
 msgid "Main memory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:519
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:444
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:453
 msgid "Storage Card A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:521
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:520
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:446
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:455
 msgid "Storage Card B"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:525
 msgid "No books to delete"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:526
 msgid "None of the selected books are on the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:544
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:600
 msgid "Deleting books from device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:564
 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/actions.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:585
 msgid ""
 "The selected books will be <b>permanently deleted</b> from your device. Are "
 "you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:610
 msgid "Cannot download metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:627
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
 msgid "social metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
 msgid "covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
 msgid "metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:630
 msgid "Downloading %s for %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:654
 msgid "Failed to download some metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:656
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
 msgid "Failed to download metadata for the following:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:659
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:658
 msgid "Failed to download metadata:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:660
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:659
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:637
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:522
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:949
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:951
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
 msgid "Error"
 msgstr "Gabim"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:670
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:707
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:669
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:706
 msgid "Cannot edit metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:728
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:731
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:727
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:730
 msgid "Cannot merge books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:732
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:731
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:736
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:735
 msgid ""
 "All book formats and metadata from the selected books will be added to the "
 "<b>first selected book.</b><br><br> The second and subsequently selected "
@@ -2915,7 +2964,7 @@ msgid ""
 "proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:747
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:746
 msgid ""
 "All book formats and metadata from the selected books will be merged into "
 "the <b>first selected book</b>.<br><br>After merger the second and "
@@ -2925,99 +2974,99 @@ msgid ""
 "from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:759
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:758
 msgid ""
 "You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
 "proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:876
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:875
 msgid "Cannot save to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:878
 msgid "Choose destination directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:912
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:911
 msgid "Error while saving"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:913
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:912
 msgid "There was an error while saving."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:919
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:920
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:921
 msgid "Could not save some books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:922
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:921
 msgid "Click the show details button to see which ones."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
 msgid "No books selected to generate catalog for"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:960
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:959
 msgid "Generating %s catalog..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:965
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:964
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:264
 msgid "No books found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:966
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:965
 msgid ""
 "No books to catalog\n"
 "Check exclude tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:976
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:975
 msgid "Catalog generated."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:979
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:978
 msgid "Export Catalog Directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:980
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:979
 msgid "Select destination for %s.%s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:996
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:995
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1009
 msgid " fetched."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1059
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1058
 msgid "Cannot convert"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1088
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1087
 msgid "Starting conversion of %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1265
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1264
 msgid "Cannot view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1209
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
 msgid "Choose the format to view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1218
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1217
 msgid "Multiple Books Selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1219
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1218
 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 "
@@ -3025,11 +3074,11 @@ msgid ""
 "continue?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1227
 msgid "Cannot open folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1266
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1265
 msgid "%s has no available formats."
 msgstr ""
 
@@ -3054,7 +3103,7 @@ msgid "The specified directory could not be processed."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:845
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:840
 msgid "No books"
 msgstr ""
 
@@ -3178,15 +3227,15 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:52
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:633
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:637
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:366
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:371
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:385
@@ -3210,12 +3259,12 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:265
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:186
@@ -3245,8 +3294,9 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:313
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1059
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1065
 msgid "Path"
 msgstr "Shteg"
 
@@ -3263,8 +3313,8 @@ msgid "Formats"
 msgstr "Formate"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:25
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:886
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1062
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:891
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1068
 msgid "Collections"
 msgstr ""
 
@@ -3277,12 +3327,12 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:305
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:311
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:317
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1068
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1072
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1074
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:458
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:467
 msgid "None"
 msgstr "Asnjë"
 
@@ -4341,11 +4391,11 @@ msgid ""
 "href=\"http://calibre-ebook.com/user_manual/xpath.html\">XPath Tutorial</a>."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:127
 msgid "Cover browser could not be loaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:179
 msgid "Browse by covers"
 msgstr ""
 
@@ -4535,128 +4585,124 @@ msgstr "Pajisje: "
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:778
-msgid "Connected "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:846
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:851
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:846
 msgid "Choose format to send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:860
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:855
 msgid "No device"
 msgstr "Pa pajisje"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:856
 msgid "Cannot send: No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:868
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:859
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:863
 msgid "No card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:869
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:860
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:910
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:905
 msgid "E-book:"
 msgstr "E-libër:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:913
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:908
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:909
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:181
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:915
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:910
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:928
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:923
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:958
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:965
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1057
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1118
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1236
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:953
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:961
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1053
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1115
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1234
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1242
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:959
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:954
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:966
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:962
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:984
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:980
 msgid "Failed to email books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:985
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:981
 msgid "Failed to email the following books:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:989
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:985
 msgid "Sent by email:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1016
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1012
 msgid "News:"
 msgstr "Lajme:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1017
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1013
 msgid "Attached is the"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1028
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1024
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1058
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1237
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1054
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1235
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1087
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1084
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1150
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1148
 msgid "Sending news to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1201
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1244
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1243
 msgid ""
 "Could not upload the following books to the device, as no suitable formats "
 "were found. Convert the book(s) to a format supported by your device first."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1305
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1304
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1306
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1305
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -4694,7 +4740,7 @@ msgid "My Books"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:69
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:289
 msgid "Generate catalog"
 msgstr ""
 
@@ -4827,157 +4873,157 @@ msgstr ""
 msgid "Narrow"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:503
 msgid "System port selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:503
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:504
 msgid ""
 "The value <b>%d</b> you have chosen for the content server port is a system "
 "port. Your operating system <b>may</b> not allow the server to run on this "
 "port. To be safe choose a port number larger than 1024."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:524
 msgid "Failed to install command line tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:527
 msgid "Command line tools installed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:528
 msgid "Command line tools installed in"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:529
 msgid ""
 "If you move calibre.app, you have to re-install the command line tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:580
 msgid "No valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:581
 msgid "%s is not a valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:584
 msgid "Choose plugin"
 msgstr "Zgjidhni shtojcë"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:596
 msgid "Plugin cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:597
 msgid "The plugin: %s cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:606
 msgid "Plugin not customizable"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:607
 msgid "Plugin: %s does not need customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:615
 msgid "Customize"
 msgstr "Personalizojeni"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:652
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:653
 msgid "Cannot remove builtin plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:653
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:654
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:684
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:685
 msgid "You must select a column to delete it"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:690
 msgid "The selected column is not a custom column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:690
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:691
 #: /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/config/__init__.py:691
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:692
 msgid "Do you really want to delete column %s and all its data?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:758
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:759
 msgid "Error log:"
 msgstr "Regjistrim gabimesh:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:765
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:766
 msgid "Access log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:793
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:794
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:332
 msgid "Failed to start content server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:817
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:818
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:587
 msgid "Select location for books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:824
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:825
 msgid "Invalid size"
 msgstr "Madhësi e pavlefshme"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:825
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:826
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:884
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:889
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:891
 msgid "Invalid database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:885
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:887
 msgid "Invalid database location "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:888
 msgid "<br>Must be a directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:890
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:892
 msgid "Invalid database location.<br>Cannot write to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:895
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:897
 msgid "Must restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:896
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:898
 msgid ""
 "The changes you made require that Calibre be restarted. Please restart as "
 "soon as practical."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:930
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:932
 msgid "Checking database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:950
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:952
 msgid "Failed to check database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:957
 msgid "Some inconsistencies found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:956
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:958
 msgid ""
 "The following books had formats listed in the database that are not actually "
 "available. The entries for the formats have been removed. You should check "
@@ -5105,296 +5151,300 @@ msgstr ""
 msgid "Sending to &device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:167
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
 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/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
 msgid "Browse for the new database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
 msgid "Show notification when &new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
 msgid "Download &social metadata (tags/ratings/etc.) by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
 msgid "&Overwrite author and title by default when fetching metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
 msgid "Default network &timeout:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
 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/config_ui.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
 msgid " seconds"
 msgstr " sekonda"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
 msgid "Normal"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
 msgid "High"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
 msgid "Low"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
 msgid "Job &priority:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
 msgid "Preferred &output format:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
 msgid "Preferred &input format order:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
 msgid "Use &Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
 msgid "Show &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
 msgid "Show &average ratings in the tags browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
 msgid "Search as you type"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
 msgid "&Delete news from library when it is automatically sent to reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
 msgid "Toolbar"
 msgstr "Panel"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
 msgid "Small"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
 msgid "&Button size in toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
 msgid "Show &text in toolbar buttons"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
 msgid "Select visible &columns in library view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
 msgid "Remove a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
 msgid "Add a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
 msgid "Edit settings of a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
 msgid "Use internal &viewer for:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
 msgid "User Interface &layout (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
 msgid "Disable &animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
-msgid "Add an email address to which to send books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
-msgid "&Add email"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
-msgid "Make &default"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
-msgid "&Remove email"
+msgid "Show &donate button (restart)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
+msgid "Add an email address to which to send books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
+msgid "&Add email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
+msgid "Make &default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
+msgid "&Remove email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
 msgid ""
 "calibre can send your books to you (or your reader) by email. Emails will be "
 "automatically sent for downloaded news to all email addresses that have Auto-"
 "send checked."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
 msgid "&Maximum number of waiting worker processes (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
 msgid "&Check database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
 msgid "&Install command line tools"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
 msgid "Open calibre &configuration directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
 msgid "Limit the max. simultaneous jobs to the available CPU &cores"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
 msgid "Debug &device detection"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
 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/config_ui.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
 msgid "Server &port:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:212
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:117
 msgid "&Username:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:213
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:119
 msgid "&Password:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
 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/config_ui.py:615
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
 msgid "Max. &cover size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:621
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:214
 msgid "&Show password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
 msgid "Max. &OPDS items per query:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
 msgid "Max. OPDS &ungrouped items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
 msgid "&Start Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:621
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
 msgid "St&op Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:626
 msgid "&Test Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
 msgid "Run server &automatically on startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:628
 msgid "View &server logs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:46
 msgid ""
 "<p>Remember to leave calibre running as the server only runs as long as "
@@ -5405,33 +5455,33 @@ msgid ""
 "the IP address of the computer calibre is running on."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:631
 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/config_ui.py:628
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:632
 msgid "Enable/&Disable plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:633
 msgid "&Customize plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:630
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:634
 msgid "&Remove plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:635
 msgid "Add new plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:632
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:636
 msgid "Plugin &file:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:634
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:638
 msgid "&Add"
 msgstr ""
 
@@ -5469,9 +5519,9 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:31
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:884
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:889
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Date"
 msgstr ""
@@ -5663,12 +5713,18 @@ msgstr ""
 msgid "ERROR"
 msgstr "GABIM"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:67
+msgid ""
+"All checked books will be <b>permanently deleted</b> from your device. "
+"Please verify the list."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 msgid "Location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1058
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1064
 msgid "Format"
 msgstr "Format"
 
@@ -6466,6 +6522,10 @@ msgstr ""
 msgid "Add tag to available tags and apply it to current book"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:20
+msgid "%s (was %s)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:501
 msgid "Item is blank"
@@ -6800,146 +6860,162 @@ msgstr ""
 msgid "Save single format to disk..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:53
 msgid "Edit metadata individually"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:56
 msgid "Edit metadata in bulk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:59
 msgid "Download metadata and covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:62
 msgid "Download only metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:64
 msgid "Download only covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:67
 msgid "Download only social metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:73
 msgid "Merge into first selected book - delete others"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:76
 msgid "Merge into first selected book - keep others"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:84
 msgid "Add books from a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:86
 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/init.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:90
 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/init.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:93
 msgid "Add Empty book. (Book entry with no formats)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:102
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
 msgid "Save to disk"
 msgstr "Ruaje në disk"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Save to disk in a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:106
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:402
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:394
 msgid "Save only %s format to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:110
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:397
 msgid "Save only %s format to disk in a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:119
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
 msgid "View"
 msgstr "Shfaqje"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:121
 msgid "View specific format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:127
 msgid "Remove selected books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:129
 msgid "Remove files of a specific format from selected books.."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:132
 msgid "Remove all formats from selected books, except..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:135
 msgid "Remove covers from selected books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:138
 msgid "Remove matching books from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:155
 msgid "Convert individually"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:157
 msgid "Bulk convert"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:161
 msgid "Create catalog of books in your calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:169
 msgid "Run welcome wizard"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:205
 msgid "Similar books..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:237
 msgid "Add books to library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:234
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:241
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:253
 msgid "Manage collections"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:328
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:333
 msgid "Cover Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:351
 msgid "Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:372
+msgid "version"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:373
+msgid "created by Kovid Goyal"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:391
+msgid "Connected "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:400
+msgid "Update found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:454
 msgid "Book Details"
 msgstr ""
 
@@ -7023,29 +7099,29 @@ msgid "Rating"
 msgstr "Vlerësim"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:324
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1084
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:674
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1176
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1182
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:886
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:885
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:890
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1156
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1162
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1165
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr ""
 
@@ -7089,11 +7165,11 @@ msgstr ""
 msgid "Restore default layout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:524
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:525
 msgid "Not allowed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:526
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
@@ -7290,155 +7366,163 @@ msgstr ""
 msgid "try deleting the file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:247
 msgid "calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:249
 msgid "&Restrict to:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:250
 msgid ""
 "Books display will be restricted to those matching the selected saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:251
 msgid "set in ui.py"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:252
 msgid "Advanced search"
 msgstr "Kërkim i thelluar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
 msgid "Alt+S"
 msgstr "Alt+S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
 msgid "&Search:"
 msgstr "&Kërko:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
 msgid ""
 "<p>Search the list of books by title, author, publisher, tags, comments, "
 "etc.<br><br>Words separated by spaces are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
 msgid "Reset Quick Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
-msgid "Choose saved search or enter name for new saved search"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
 msgid "Copy current search text (instead of search name)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
 msgid "Save current search under the name shown in the box"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
 msgid "Delete current saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
 msgid "Add books"
 msgstr "Shtoni libra"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
 msgid "A"
 msgstr "S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
 msgid "Remove books"
 msgstr "Hiqni libra"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
 msgid "Del"
 msgstr "Del"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
 msgid "Edit meta information"
 msgstr "Përpunoni të dhëna meta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
 msgid "E"
 msgstr "P"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
 msgid "Merge book records"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
 msgid "M"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
 msgid "Send to device"
 msgstr "Dërgoje te pajisja"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
 msgid "S"
 msgstr "R"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
 msgid "Fetch news"
 msgstr "Bjer lajme"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
 msgid "F"
 msgstr "B"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
 msgid "Convert E-books"
 msgstr "Shndërro E-libra"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
 msgid "C"
 msgstr "N"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
 msgid "V"
 msgstr "q"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
 msgid "Open containing folder"
 msgstr "Hap dosjen mëmë"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
 msgid "Show book details"
 msgstr "Shfaq hollësi libri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
 msgid "Books by same author"
 msgstr "Libra nga po ai autor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
 msgid "Books in this series"
 msgstr "Libra në këtë seri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
 msgid "Books by this publisher"
 msgstr "Libra nga ky botues"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
 msgid "Books with the same tags"
 msgstr "Libra me të njëjtat etiketa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
 msgid "Configure calibre"
 msgstr "Formësoni calibre-in"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
 msgid "Ctrl+P"
 msgstr "Ctrl+P"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
+msgid "Help"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
+msgid "Browse the calibre User Manual"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
+msgid "F1"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:20
 msgid ""
 "Redirect console output to a dialog window (both stdout and stderr). Useful "
@@ -7465,32 +7549,36 @@ msgstr ""
 msgid "No matches found for this book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:91
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:262
 msgid "Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:313
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:315
 msgid "The selected search will be <b>permanently deleted</b>. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:357
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:392
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:398
 msgid "Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:406
+msgid "Choose saved search or enter name for new saved search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:47
 msgid "({0} of {1})"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:53
 msgid "(all books)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:55
 msgid "({0} of all)"
 msgstr ""
 
@@ -7613,18 +7701,31 @@ msgstr ""
 msgid "Sort by average rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:775
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:772
+msgid "Set the sort order for entries in the Tag Browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:778
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:775
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:778
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:783
+msgid ""
+"When selecting multiple entries in the Tag Browser match any or all of them"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:787
 msgid "Manage &user categories"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:790
+msgid "Add your own categories to the Tag Browser"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182
 msgid "Convert book %d of %d (%s)"
@@ -7650,15 +7751,15 @@ msgstr ""
 msgid "Queueing "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:239
 msgid "Fetch news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:301
 msgid "Convert existing"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:302
 msgid ""
 "The following books have already been converted to %s format. Do you wish to "
 "reconvert them?"
@@ -7672,104 +7773,91 @@ msgstr ""
 msgid "&Donate to support calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:168
 msgid "&Eject connected device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:173
 msgid "&Restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:206
-msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:212
-msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:227
 msgid "Calibre Quick Start Guide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:389
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:381
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:377
 msgid "Cannot configure while there are running jobs."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:382
 msgid "Cannot configure before calibre is restarted."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:425
 msgid "No detailed info available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:426
 msgid "No detailed information is available for books on the device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:486
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:478
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:506
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:487
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:479
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using third party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:492
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:507
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:547
 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."
+"you find it useful, please consider donating to support its development. "
+"Your donation helps keep calibre development going."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:573
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:576
 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/ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:640
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:633
 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/update.py:52
-msgid ""
-"<span style=\"color:red; font-weight:bold\">Latest version: <a "
-"href=\"%s\">%s</a></span>"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/update.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:56
 msgid "Update available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/update.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:57
 msgid ""
 "%s has been updated to version %s. See the <a href=\"http://calibre-"
 "ebook.com/whats-new\">new features</a>. Visit the download page?"
@@ -8247,29 +8335,25 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:270
 msgid ""
 "Library\n"
-"%d\n"
-"books"
+"%d books"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:271
 msgid ""
 "Reader\n"
-"%s\n"
-"available"
+"%s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:272
 msgid ""
 "Card A\n"
-"%s\n"
-"available"
+"%s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:273
 msgid ""
 "Card B\n"
-"%s\n"
-"available"
+"%s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:277
@@ -8292,35 +8376,39 @@ msgstr ""
 msgid "Books located at"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:306
+msgid "free"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:557
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:558
 msgid "Upper Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:559
 msgid "Lower Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:560
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:561
 msgid "Title Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:974
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:983
 msgid "Drag to resize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1015
 msgid "Show"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1012
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1022
 msgid "Hide"
 msgstr ""
 
@@ -9589,89 +9677,89 @@ msgstr ""
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:706
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:708
 msgid "Download finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:708
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:710
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:714
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:716
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:716
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:718
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:718
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:720
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:807
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:809
 msgid "Could not fetch article. Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:828
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:830
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:833
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:835
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:839
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:841
 msgid "Trying to download cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:841
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:922
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:924
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:938
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:940
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:948
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:950
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:960
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
 msgid "Downloading cover from %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1002
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1190
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1192
 msgid "Untitled Article"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1261
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1263
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1272
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1274
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1289
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1291
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1436
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1438
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1452
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1454
 msgid ""
 "You do not have permission to download this issue. Either your subscription "
 "has expired or you have exceeded the maximum allowed downloads for today."
diff --git a/src/calibre/translations/sr.po b/src/calibre/translations/sr.po
index 12a6eecb37..360d13f7b0 100644
--- a/src/calibre/translations/sr.po
+++ b/src/calibre/translations/sr.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-07-03 01:21+0000\n"
-"PO-Revision-Date: 2010-07-03 07:07+0000\n"
+"POT-Creation-Date: 2010-07-10 16:12+0000\n"
+"PO-Revision-Date: 2010-07-12 16:48+0000\n"
 "Last-Translator: Vladimir Oka <Unknown>\n"
 "Language-Team: Serbian <sr@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: 2010-07-04 03:44+0000\n"
+"X-Launchpad-Export-Date: 2010-07-13 03:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
@@ -27,10 +27,10 @@ msgstr "Ne radi baš ništa"
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:71
 #: /home/kovid/work/calibre/src/calibre/devices/prs500/books.py:267
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:466
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:396
-#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:98
-#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:101
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:492
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:398
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:97
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:100
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/metadata.py:56
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:428
 #: /home/kovid/work/calibre/src/calibre/ebooks/fb2/input.py:67
@@ -72,9 +72,9 @@ msgstr "Ne radi baš ništa"
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:818
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:49
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:51
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:910
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:915
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:981
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:911
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:916
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:982
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:137
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:139
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:108
@@ -102,20 +102,20 @@ msgstr "Ne radi baš ništa"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:233
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:290
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:815
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:818
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:814
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:817
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:172
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:179
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:22
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:135
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:903
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:912
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1192
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1195
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:899
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:908
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1191
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1194
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:120
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:155
@@ -123,8 +123,8 @@ msgstr "Ne radi baš ništa"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:172
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:362
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:877
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1054
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:882
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1060
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:87
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:92
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:185
@@ -170,7 +170,7 @@ msgstr "Pisač metapodataka"
 msgid "Catalog generator"
 msgstr "Generator kataloga"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:15
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:16
 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 "
@@ -179,7 +179,7 @@ msgstr ""
 "Prati sve linkove u HTML fajlu i napravi ZIP fajl koji sadrži sve povezane "
 "fajlove. Ovaj dodatak se pokreće svaki put kad dodate HTML fajl u biblioteku."
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:51
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:52
 msgid ""
 "Character encoding for the input HTML files. Common choices include: cp1252, "
 "latin1, iso-8859-1 and utf-8."
@@ -187,7 +187,7 @@ msgstr ""
 "Kodni raspored za ulazne HTML fajlove. Najčešće korišćeni kodni rasporedi "
 "su: cp1252, latin1, iso-8859-1 i utf-8."
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:58
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:59
 msgid ""
 "Create a PMLZ archive containing the PML file and all images in the "
 "directory pmlname_img or images. This plugin is run every time you add a PML "
@@ -197,49 +197,49 @@ msgstr ""
 "plmname_img, ili images. Ovaj plugin se pokreće svaki put kad dodate PML "
 "fajl u biblioteku."
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:90
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:93
 msgid "Extract cover from comic files"
 msgstr "Uzmi naslovnu stranu stripa"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:117
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:128
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:140
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:150
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:160
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:171
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:181
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:191
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:201
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:211
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:221
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:232
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:243
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:255
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:276
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:287
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:297
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:307
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:120
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:131
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:153
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:163
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:174
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:184
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:194
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:204
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:214
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:224
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:235
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:246
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:258
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:279
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:290
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:300
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:310
 msgid "Read metadata from %s files"
 msgstr "Čitaj metapodatke iz %s fajlova"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:266
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:269
 msgid "Read metadata from ebooks in RAR archives"
 msgstr "Čitaj metapodatke iz e-knjiga u RAR arhivama"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:318
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:321
 msgid "Read metadata from ebooks in ZIP archives"
 msgstr "Čitaj metapodatke iz e-knjiga u ZIP arhivama"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:331
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:341
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:351
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:373
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:384
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:394
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:334
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:344
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:354
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:376
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:387
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:397
 msgid "Set metadata in %s files"
 msgstr "Upiši metapodatke u %s fajlova"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:362
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:365
 msgid "Set metadata from %s files"
 msgstr "Postavi metapodatke iz %s fajlova"
 
@@ -396,35 +396,35 @@ msgstr ""
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr "Ovaj profil je namenjen Amazon Kindle DX čitaču."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:31
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
 msgid "Installed plugins"
 msgstr "Instalirani dodaci"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:33
 msgid "Mapping for filetype plugins"
 msgstr "Mapiranje dodataka za različite tipove fajlova"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:33
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:34
 msgid "Local plugin customization"
 msgstr "Podešavanja za lokalne dodatke"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:34
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
 msgid "Disabled plugins"
 msgstr "Neaktivni dodaci"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
 msgid "Enabled plugins"
 msgstr "Uključeni dodaci"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:83
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:84
 msgid "No valid plugin found in "
 msgstr "Nije pronađen ispravan dodatak u "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:460
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:468
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr "Inicijalizovanje dodatka %s nije uspelo. Izveštaj o grešci je:"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:493
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
 msgid ""
 "    %prog options\n"
 "\n"
@@ -436,17 +436,17 @@ msgstr ""
 "        Podesi calibre učitavanjem spoljnjih dodataka.\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:499
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr ""
 "Instaliraj dodatak biranjem direktorijuma u kome se nalazi ZIP fajl koji ga "
 "sadrži."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr "Ukloni dodatak po imenu. Nema efekta na ugrađene dodatke"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:503
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:511
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
@@ -454,15 +454,15 @@ msgstr ""
 "Podesi dodatak. Navedi ime dodatka i komandu za podešavanje razdvojene "
 "zarezom."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:505
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:513
 msgid "List all installed plugins"
 msgstr "Izlistaj sve instalirane dodatke"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Enable the named plugin"
 msgstr "Uključi navedeni dodatak"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Disable the named plugin"
 msgstr "Isključi navedeni dodatak"
 
@@ -620,7 +620,7 @@ msgstr "Uspostavi komunikaciju s Hanlin V5 čitačem."
 msgid "Communicate with the BOOX eBook reader."
 msgstr "Uspostavi komunikaciju s BOOX čitačem."
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:121
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:123
 msgid ""
 "Comma separated list of directories to send e-books to on the device. The "
 "first one that exists will be used."
@@ -693,34 +693,34 @@ msgstr "Uspostavi komunikaciju s Kobo čitačem"
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:51
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:54
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:57
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:157
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:159
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:64
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:67
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:70
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:130
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:137
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:160
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:139
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:162
 msgid "Getting list of books on device..."
 msgstr "Preuzimam spisak knjiga sa uređaja..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:218
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:258
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:244
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:262
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:219
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:263
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:246
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:264
 msgid "Removing books from device..."
 msgstr "Uklanjam knjige sa uređaja..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:262
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:269
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:269
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:274
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:267
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:274
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:271
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:276
 msgid "Removing books from device metadata listing..."
 msgstr "Uklanjam knjige iz spiska metapodataka na uređaju..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:274
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:308
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:208
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:238
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:313
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:210
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:240
 msgid "Adding books to device metadata listing..."
 msgstr "Dodajem knjige u spisak metapodataka na uređaju..."
 
@@ -736,6 +736,10 @@ msgstr "Uspostavi komunikaciju s Booq Avant čitačem"
 msgid "Communicate with the Sweex MM300"
 msgstr "Uspostavi komunikaciju sa Sweex MM300 uređajem"
 
+#: /home/kovid/work/calibre/src/calibre/devices/misc.py:75
+msgid "Communicate with the Pandigital Novel"
+msgstr "Uspostavi komunikaciju s Pandigital Novel čitačem"
+
 #: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:17
 msgid "Communicate with the Nokia 770 internet tablet."
 msgstr "Uspostavi komunikaciju s Nokia 770 uređajem."
@@ -885,12 +889,12 @@ msgstr "Uspostavi komunikaciju s čitačem e-knjiga."
 msgid "Get device information..."
 msgstr "Pročitaj informacije o uređaju..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:188
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:192
 msgid "Transferring books to device..."
 msgstr "Šaljem knjige na uređaj..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:305
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:307
 msgid "Sending metadata to device..."
 msgstr "Šaljem metapodatke na uređaj..."
 
@@ -1655,6 +1659,67 @@ msgstr "Izvodim transformacije na e-knjizi..."
 msgid "Creating"
 msgstr "Kreiram"
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/__init__.py:18
+msgid "ePub Fixer"
+msgstr "ePub Radionica"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/epubcheck.py:18
+msgid "Workaround epubcheck bugs"
+msgstr "Izbegni epubcheck greške"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/epubcheck.py:22
+msgid ""
+"Workarounds for bugs in the latest release of epubcheck. epubcheck reports "
+"many things as errors that are not actually errors. epub-fix will try to "
+"detect these and replace them with constructs that epubcheck likes. This may "
+"cause significant changes to your epub, complain to the epubcheck project."
+msgstr ""
+"Privremena rešenja za greške u najnovijoj verziji epubchecka. epubcheck kao "
+"greške prijavljuje mnoge koje to u stvari nisu. epub-fix će pokušati da "
+"otkrije ovakve konstrukcije i zameni ih takvim kakve će biti više po volji "
+"epubchecka. Ovo može značajno da izmeni vaše epub fajlove. Za sve probleme "
+"obratite se projektu epubcheck."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:19
+msgid ""
+"%prog [options] file.epub\n"
+"\n"
+"Fix common problems in EPUB files that can cause them to be rejected by "
+"poorly designed publishing services.\n"
+"\n"
+"By default, no fixing is done and messages are printed out for each error "
+"detected. Use the options to control which errors are automatically fixed."
+msgstr ""
+"%prog [opcije] fajl.epub\n"
+"\n"
+"Popravi uobičajene probleme u EPUB fajlovima koji dovode do toga da oni budu "
+"odbijeni od strane loše projektovanih izdavačkih servisa.\n"
+"\n"
+"Podrazumeva se da neće bit nikakve popravke i da će se za svaku grešku samo "
+"prikazati poruka. Koristite ovu opciju da odredite koje greške će biti "
+"automatski popravljene."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:50
+msgid "You must specify an epub file"
+msgstr "Morate da specificirate epub fajl"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:17
+msgid "Fix unmanifested files"
+msgstr "Popravi fajlove koji nisu u manifestu"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:21
+msgid ""
+"Fix unmanifested files. epub-fix can either add them to the manifest or "
+"delete them as specified by the delete unmanifested option."
+msgstr ""
+"Popravi fajlove koji nisu u manifestu. epub-fix ih može ili dodati u "
+"manifest, ili ih izbrisati, što je određeno opcijom za brisanje fajlova koji "
+"nisu u manifestu."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:32
+msgid "Delete unmanifested files instead of adding them to the manifest"
+msgstr "Izbriši fajlove koji nisu u manifestu umesto da ih dodaš u manifest."
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:56
 msgid ""
 "Extract the contents of the generated EPUB file to the specified directory. "
@@ -2018,11 +2083,11 @@ msgstr "Strip"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:98
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:882
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:887
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:543
 msgid "Title"
 msgstr "Naslov"
@@ -2031,7 +2096,7 @@ msgstr "Naslov"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:364
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:883
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:888
 msgid "Author(s)"
 msgstr "Autori"
 
@@ -2054,7 +2119,7 @@ msgstr "Producent"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:67
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:318
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1073
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1079
 msgid "Comments"
 msgstr "Komentari"
 
@@ -2063,7 +2128,7 @@ msgstr "Komentari"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:306
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1069
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1075
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:139
 msgid "Tags"
 msgstr "Etikete"
@@ -2073,7 +2138,7 @@ msgstr "Etikete"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:323
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1084
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:87
 msgid "Series"
 msgstr "Serija"
@@ -2083,7 +2148,7 @@ msgid "Language"
 msgstr "Jezik"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:406
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1067
 msgid "Timestamp"
 msgstr "Vremenska oznaka"
 
@@ -2348,7 +2413,7 @@ msgstr ""
 "LibraryThing.com\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1226
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1398
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1399
 msgid "Cover"
 msgstr "Naslovna strana"
 
@@ -2391,70 +2456,70 @@ msgstr "Svi članci"
 msgid "This is an Amazon Topaz book. It cannot be processed."
 msgstr "Ovo je Amazon Topaz knjiga. Nju nije moguće obraditi."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1399
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1400
 msgid "Title Page"
 msgstr "Naslovna strana"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1400
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1401
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:15
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:53
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:194
 msgid "Table of Contents"
 msgstr "Sadržaj"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1401
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1402
 msgid "Index"
 msgstr "Indeks"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1402
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1403
 msgid "Glossary"
 msgstr "Pojmovnik"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1403
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1404
 msgid "Acknowledgements"
 msgstr "Zahvalnosti"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1404
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1405
 msgid "Bibliography"
 msgstr "Bibliografija"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1405
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1406
 msgid "Colophon"
 msgstr "Impresum"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1406
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1407
 msgid "Copyright"
 msgstr "Autorska prava"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1407
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1408
 msgid "Dedication"
 msgstr "Posveta"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1408
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1409
 msgid "Epigraph"
 msgstr "Epigraf"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1409
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1410
 msgid "Foreword"
 msgstr "Predgovor"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1410
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1411
 msgid "List of Illustrations"
 msgstr "Spisak ilustracija"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1411
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1412
 msgid "List of Tables"
 msgstr "Spisak tabela"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1412
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1413
 msgid "Notes"
 msgstr "Beleške"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1413
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1414
 msgid "Preface"
 msgstr "Predgovor"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1414
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1415
 msgid "Main Text"
 msgstr "Glavni tekst"
 
@@ -2499,7 +2564,7 @@ msgstr "Bočna traka"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:22
 #: /home/kovid/work/calibre/src/calibre/ebooks/tcr/input.py:23
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:23
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:24
 msgid ""
 "Normally calibre treats blank lines as paragraph markers. With this option "
 "it will assume that every line represents a paragraph instead."
@@ -2509,7 +2574,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:26
 #: /home/kovid/work/calibre/src/calibre/ebooks/tcr/input.py:27
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:27
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:28
 msgid ""
 "Normally calibre treats blank lines as paragraph markers. With this option "
 "it will assume that every line starting with an indent (either a tab or 2+ "
@@ -2680,7 +2745,7 @@ msgstr ""
 "Traži podatke of PDF fajlu.\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
 msgid "Author"
 msgstr "Autor"
@@ -2850,7 +2915,7 @@ msgstr ""
 "Navedi stepen kompresije u razmeri od 1 do 10, gde je 1 najniži i najbrži, a "
 "10 najviši i najsporiji stepen kompresije."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:33
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:34
 msgid ""
 "Normally extra spaces are condensed into a single space. With this option "
 "all spaces will be displayed."
@@ -2858,7 +2923,7 @@ msgstr ""
 "Obično se višestruki razmaci sažmu u samo jedan. Ova opcija omogućava "
 "prikazivanje svih razmaka."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:36
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:37
 msgid ""
 "Run the text input through the markdown pre-processor. To learn more about "
 "markdown see"
@@ -2866,7 +2931,7 @@ msgstr ""
 "Propusti tekst kroz markdown pretprocesor. Za više informacija o markdownu "
 "vidi"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:39
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:40
 msgid "Do not insert a Table of Contents into the output text."
 msgstr "Nemoj da dodaješ Sadržaj u izlazni tekst."
 
@@ -3041,7 +3106,7 @@ msgstr "Kopiraj"
 msgid "Copy to Clipboard"
 msgstr "Kopiraj u memoriju"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:400
 msgid "Choose Files"
 msgstr "Izaberi fajlove"
 
@@ -3056,13 +3121,13 @@ msgid "User annotations generated from main library only"
 msgstr "Koristite samo beleške iz glavne biblioteke"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:75
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:612
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:671
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:708
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:729
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:877
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1060
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:670
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:707
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:728
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:876
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:941
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1059
 msgid "No books selected"
 msgstr "Nije izabrana nijedna knjiga"
 
@@ -3102,144 +3167,144 @@ msgstr "Koliko praznih knjiga?"
 msgid "How many empty books should be added?"
 msgstr "Koliko praznih knjiga treba da se doda?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:340
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:390
 msgid "Uploading books to device."
 msgstr "Prenosim knjige na uređaj."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:350
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:137
 msgid "Books"
 msgstr "Knjige"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
 msgid "EPUB Books"
 msgstr "EPUB knjige"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
 msgid "LRF Books"
 msgstr "LRF knjige"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
 msgid "HTML Books"
 msgstr "HTML knjige"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
 msgid "LIT Books"
 msgstr "LIT knjige"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
 msgid "MOBI Books"
 msgstr "MOBI knjige"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
 msgid "Topaz books"
 msgstr "Topaz knjige"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
 msgid "Text books"
 msgstr "Knijge u tekst formatu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:359
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
 msgid "PDF Books"
 msgstr "PDF knjige"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:359
 msgid "Comics"
 msgstr "Stripovi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:360
 msgid "Archives"
 msgstr "Arhive"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:364
 msgid "Supported books"
 msgstr "Podržane knjige"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:399
 msgid "Merged some books"
 msgstr "Dodao sam neke knjige"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:401
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:400
 msgid ""
 "Some duplicates were found and merged into the following existing books:"
 msgstr ""
 "Pronađeni su neki duplikati i dodati sledećim već postojećim knjigama:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:409
 msgid "Failed to read metadata"
 msgstr "Nisam uspeo da pročitam metapodatke"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:410
 msgid "Failed to read metadata from the following"
 msgstr "Nisam upseo da pročitam metapodatke iz"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:434
 msgid "Add to library"
 msgstr "Dodaj u biblioteku"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:460
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1229
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:459
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1228
 msgid "No book selected"
 msgstr "Nije izabrana nijedna knjiga"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:434
 msgid "No book files found"
 msgstr "Nisu pronađeni fajlovi s knjigama"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:456
 msgid "Cannot delete"
 msgstr "Ne mogu da obrišem"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:469
 msgid "Choose formats to be deleted"
 msgstr "Izaberite formate za brisanje"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:488
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:487
 msgid "Choose formats <b>not</b> to be deleted"
 msgstr "Izaberite formate koji <b>neće</b> biti obrisani"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:507
 msgid "Cannot delete books"
 msgstr "Ne mogu da izbrišem knjige"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:509
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:508
 msgid "No device is connected"
 msgstr "Nije priključen nijedan uređaj"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:519
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:518
 msgid "Main memory"
 msgstr "Osnovna memorija"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:520
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:444
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:519
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:454
 msgid "Storage Card A"
 msgstr "Memorijska kartica A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:521
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:446
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:455
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:447
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:456
 msgid "Storage Card B"
 msgstr "Memorijska kartica B"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:525
 msgid "No books to delete"
 msgstr "Nema knjiga koje mogu biti izbrisane"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:526
 msgid "None of the selected books are on the device"
 msgstr "Nijedna od izabranih knjiga se ne nalazi na uređaju"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:544
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:600
 msgid "Deleting books from device."
 msgstr "Brišem knjige sa uređaja."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:564
 msgid ""
 "The selected books will be <b>permanently deleted</b> and the files removed "
 "from your computer. Are you sure?"
@@ -3247,7 +3312,7 @@ msgstr ""
 "Izabrane knjige će biti <b>obrisane zauvek</b> i fajlovi uklonjeni s vašeg "
 "računara. Da li ste sigurni?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:585
 msgid ""
 "The selected books will be <b>permanently deleted</b> from your device. Are "
 "you sure?"
@@ -3255,61 +3320,61 @@ msgstr ""
 "Izabrane knjige će biti <b>zauvek izbrisane</b> s vašeg uređaja. Da li ste "
 "sigurni?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:610
 msgid "Cannot download metadata"
 msgstr "Ne mogu da preuzmem metapodatke"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:627
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
 msgid "social metadata"
 msgstr "društveni metapodaci"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
 msgid "covers"
 msgstr "naslovne strane"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
 msgid "metadata"
 msgstr "metapodaci"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:630
 msgid "Downloading %s for %d book(s)"
 msgstr "Preuzimam %s za %d knjiga"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:654
 msgid "Failed to download some metadata"
 msgstr "Nisam uspeo da preuzmem neke metapodatke"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:656
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
 msgid "Failed to download metadata for the following:"
 msgstr "Nisam uspeo da preuzmem metapodatke za:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:659
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:658
 msgid "Failed to download metadata:"
 msgstr "Nisam uspeo da preuzmem metapodatke:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:660
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:637
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:522
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:949
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:659
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:638
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:951
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
 msgid "Error"
 msgstr "Greška"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:670
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:707
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:669
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:706
 msgid "Cannot edit metadata"
 msgstr "Ne mogu da promenim metapodatke"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:728
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:731
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:727
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:730
 msgid "Cannot merge books"
 msgstr "Ne mogu da spojim knjige"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:732
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:731
 msgid "At least two books must be selected for merging"
 msgstr "Za spajanje je potrebno izabrati bar dve knjige"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:736
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:735
 msgid ""
 "All book formats and metadata from the selected books will be added to the "
 "<b>first selected book.</b><br><br> The second and subsequently selected "
@@ -3321,7 +3386,7 @@ msgstr ""
 "izbrisane niti promenjene.<br><br>Molim vas da potvrdite da želite da "
 "nastavite"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:747
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:746
 msgid ""
 "All book formats and metadata from the selected books will be merged into "
 "the <b>first selected book</b>.<br><br>After merger the second and "
@@ -3337,7 +3402,7 @@ msgstr ""
 "biti trajno <b>izbrisani</b> sa vašeg računara.<br><br>Da li ste "
 "<b>sigurni</b> da želite da nastavite?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:759
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:758
 msgid ""
 "You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
 "proceed?"
@@ -3345,45 +3410,45 @@ msgstr ""
 "Pripremili ste se za spajanje više od 5 kjniga. Da li ste <b>sigurni</b> da "
 "želite da nastavite?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:876
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:875
 msgid "Cannot save to disk"
 msgstr "Ne mogu da snimim na disk"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:878
 msgid "Choose destination directory"
 msgstr "Promeni ciljni direktorijum"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:912
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:911
 msgid "Error while saving"
 msgstr "Greška pri snimanju"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:913
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:912
 msgid "There was an error while saving."
 msgstr "Došlo je do greške pri snimanju."
 
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:919
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:920
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:921
 msgid "Could not save some books"
 msgstr "Nisam uspeo da snimim neke knjige"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:922
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:921
 msgid "Click the show details button to see which ones."
 msgstr "Kliknite na dugme za više detalja da vidite koje."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
 msgid "No books selected to generate catalog for"
 msgstr "Nema knjiga za koje bi se kreirao katalog"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:960
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:959
 msgid "Generating %s catalog..."
 msgstr "Kreiram katalog %s..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:965
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:964
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:264
 msgid "No books found"
 msgstr "Nije nađena nijedna knjiga"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:966
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:965
 msgid ""
 "No books to catalog\n"
 "Check exclude tags"
@@ -3391,49 +3456,49 @@ msgstr ""
 "Nema knjiga za katalog\n"
 "Proverite ignorisane etikete"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:976
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:975
 msgid "Catalog generated."
 msgstr "Katalog je kreiran."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:979
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:978
 msgid "Export Catalog Directory"
 msgstr "Direktorijum za izvoz kataloga"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:980
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:979
 msgid "Select destination for %s.%s"
 msgstr "Izaberi odredište za %s.%s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:996
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:995
 msgid "Fetching news from "
 msgstr "Preuzimam vesti sa "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1009
 msgid " fetched."
 msgstr " preuzeto."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1059
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1058
 msgid "Cannot convert"
 msgstr "Ne mogu da konvertujem"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1088
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1087
 msgid "Starting conversion of %d book(s)"
 msgstr "Počinjem konverziju %d knjiga."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1265
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1264
 msgid "Cannot view"
 msgstr "Nemoguće pregledati"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1209
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
 msgid "Choose the format to view"
 msgstr "Izaberite format za prikaz"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1218
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1217
 msgid "Multiple Books Selected"
 msgstr "Izabrano je više knjiga"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1219
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1218
 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 "
@@ -3445,11 +3510,11 @@ msgstr ""
 "započet, ovaj proces se ne može prekinuti pre završetka. Da li želite da "
 "nastavite?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1227
 msgid "Cannot open folder"
 msgstr "Ne mogu da otvorim direktorijum"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1266
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1265
 msgid "%s has no available formats."
 msgstr "%s nema raspoloživih formata."
 
@@ -3474,7 +3539,7 @@ msgid "The specified directory could not be processed."
 msgstr "Nisam mogao da obradim navedeni direktorijum"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:845
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr "Nema knjiga"
 
@@ -3612,15 +3677,15 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:52
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:633
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:637
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:366
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:371
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:385
@@ -3644,12 +3709,12 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:259
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:265
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:186
@@ -3682,8 +3747,9 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:313
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1059
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1065
 msgid "Path"
 msgstr "Putanja"
 
@@ -3700,8 +3766,8 @@ msgid "Formats"
 msgstr "Formati"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:25
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:886
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1062
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:891
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1068
 msgid "Collections"
 msgstr "Kolekcije"
 
@@ -3714,12 +3780,12 @@ msgstr "Kliknite da biste otvorili"
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:305
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:311
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:317
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1068
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1072
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1074
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:458
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:274
 msgid "None"
 msgstr "Nema"
 
@@ -4609,12 +4675,12 @@ msgid "Footer regular expression:"
 msgstr "Regularni izraz za fusnotu:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:56
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:76
 msgid "Invalid regular expression"
 msgstr "Neispravan regularni izraz"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:77
 msgid "Invalid regular expression: %s"
 msgstr "Neispravan regularni izraz: %s"
 
@@ -4832,11 +4898,11 @@ msgstr ""
 "vidi <a href=\"http://calibre-ebook.com/user_manual/xpath.html\">Uvod u "
 "XPath</a>."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:127
 msgid "Cover browser could not be loaded"
 msgstr "Izlog omota nije mogao biti učitan"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:179
 msgid "Browse by covers"
 msgstr "Pretraži po naslovnim stranama"
 
@@ -4895,124 +4961,124 @@ msgstr "etikete za dodavanje"
 msgid "tags to remove"
 msgstr "etikete za uklanjanje"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:49
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:135
 msgid "No details available."
 msgstr "Nema detaljnih podataka."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:155
 msgid "Device no longer connected."
 msgstr "Uređaj više nije priključen."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:270
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:271
 msgid "Get device information"
 msgstr "Prikupi informacije o uređaju"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:282
 msgid "Get list of books on device"
 msgstr "Preuzmi spisak knjiga sa uređaja"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:292
 msgid "Get annotations from device"
 msgstr "Preuzmi beleške sa uređaja"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:301
 msgid "Send metadata to device"
 msgstr "Pošalji metapodatke na uređaj"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:305
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:306
 msgid "Send collections to device"
 msgstr "Pošalji kolekciju na uređaj"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:330
 msgid "Upload %d books to device"
 msgstr "Prenesi %d knjiga na uređaj"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:345
 msgid "Delete books from device"
 msgstr "Izbriši kjnige sa uređaja"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:362
 msgid "Download books from device"
 msgstr "Preuzmi knjige sa uređaja"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:372
 msgid "View book on device"
 msgstr "Pregledaj knjige na uređaju"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:408
 msgid "Set default send to device action"
 msgstr "Postavi podrazumevanu akciju pri prenošenju na uređaj"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:413
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:420
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:422
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:425
 msgid "Email to"
 msgstr "Pošalji elektronskom poštom na"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:425
 msgid " and delete from library"
 msgstr " i izbriši iz biblioteke"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:434
 msgid "Send to main memory"
 msgstr "Pošalji u osnovnu memoriju"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:436
 msgid "Send to storage card A"
 msgstr "Pošalji na memorijsku karticu A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:437
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:438
 msgid "Send to storage card B"
 msgstr "Pošalji na memorijsku karticu B"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:442
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:452
 msgid "Main Memory"
 msgstr "Osnovna memorija"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:469
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:470
 msgid "Send and delete from library"
 msgstr "Pošalji i izbriši iz biblioteke"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:471
 msgid "Send specific format"
 msgstr "Pošalji određeni format"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:509
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:510
 msgid "Connect to folder"
 msgstr "Uspostavi komunikaciju s direktorijumom"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:516
 msgid "Connect to iTunes"
 msgstr "Uspostavi komunikaciju sa iTunes"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:521
 msgid "Eject device"
 msgstr "Isključi uređaj"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:529
 msgid "Fetch annotations (experimental)"
 msgstr "Preuzmi beleške (eksperimentalno)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:638
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:639
 msgid "Error communicating with device"
 msgstr "Greška u komunikaciji sa uređajem"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:659
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:660
 msgid "Select folder to open as device"
 msgstr "Izaberite direktorijum koji će biti korišćen kao uređaj"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:704
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:705
 msgid "Failed"
 msgstr "Nije uspelo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:710
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:711
 msgid "Error talking to device"
 msgstr "Greška u komunikaciji sa uređajem"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:711
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:712
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -5020,123 +5086,119 @@ msgstr ""
 "Došlo je do privremene greške u komunikaciji sa uređajem. Molim vas da "
 "isključite uređaj i/ili ponovo pokrenete računar."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:753
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:754
 msgid "Device: "
 msgstr "Uređaj: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:755
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:756
 msgid " detected."
 msgstr " detektovan."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:778
-msgid "Connected "
-msgstr "Priključen je "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:846
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr "izabrane za slanje"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:851
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:847
 msgid "Choose format to send to device"
 msgstr "Izaberi format za slanje na uređaj"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:860
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:856
 msgid "No device"
 msgstr "Nema uređaja"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:857
 msgid "Cannot send: No device is connected"
 msgstr "Ne mogu da pošaljem: Nije priključen nijedan uređaj"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:860
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:868
 msgid "No card"
 msgstr "Nema memorijske kartice"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:869
 msgid "Cannot send: Device has no storage card"
 msgstr "Ne mogu da pošaljem: Uređaj nema memorijsku karticu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:910
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:906
 msgid "E-book:"
 msgstr "E-knjiga:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:913
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:909
 msgid "Attached, you will find the e-book"
 msgstr "E-knjigu ćete pronaći priključenu uz ovu poruku"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:910
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:181
 msgid "by"
 msgstr "od"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:915
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:911
 msgid "in the %s format."
 msgstr "u formatu %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:928
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:924
 msgid "Sending email to"
 msgstr "Šaljem poruku za"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:958
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:965
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1057
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1118
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1236
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:954
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:962
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1054
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1235
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:1243
 msgid "No suitable formats"
 msgstr "Nema odgovarajućih formata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:959
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:955
 msgid "Auto convert the following books before sending via email?"
 msgstr "Automatski konvertuj ove knjige pre slanja elektronskom poštom?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:966
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:963
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 "Nisam uspeo da pošaljem ove knjige, jer nisu pronađeni odgovarajući formati:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:984
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:981
 msgid "Failed to email books"
 msgstr "Nisam uspeo da pošaljem knjige"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:985
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:982
 msgid "Failed to email the following books:"
 msgstr "Nisam uspeo da pošaljem sledeće knjige:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:989
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:986
 msgid "Sent by email:"
 msgstr "Poslato elektronskom poštom:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1016
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1013
 msgid "News:"
 msgstr "Vesti:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1017
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1014
 msgid "Attached is the"
 msgstr "Priključeno je"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1028
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1025
 msgid "Sent news to"
 msgstr "Poslao vesti za"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1058
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1237
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1055
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1117
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1236
 msgid "Auto convert the following books before uploading to the device?"
 msgstr "Automatski konvertuj sledeće knjige pre slanja na uređaj?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1087
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1085
 msgid "Sending catalogs to device."
 msgstr "Šaljem katalog na uređaj."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1150
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1149
 msgid "Sending news to device."
 msgstr "Šaljem vesti na uređaj."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1202
 msgid "Sending books to device."
 msgstr "Šaljem knjige na uređaj."
 
@@ -5192,7 +5254,7 @@ msgid "My Books"
 msgstr "Moje knjige"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:69
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:289
 msgid "Generate catalog"
 msgstr "Napravi katalog"
 
@@ -5336,11 +5398,11 @@ msgstr "Širok"
 msgid "Narrow"
 msgstr "Uzak"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:503
 msgid "System port selected"
 msgstr "Izabran je sistemski port"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:503
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:504
 msgid ""
 "The value <b>%d</b> you have chosen for the content server port is a system "
 "port. Your operating system <b>may</b> not allow the server to run on this "
@@ -5350,131 +5412,131 @@ msgstr ""
 "port. Vaš operativni sistem <b>može</b> da ne dozvoli serveru da koristi "
 "ovaj port. Da biste bili sigurni izaberite port veći od 1024."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:524
 msgid "Failed to install command line tools."
 msgstr "Nisam uspeo da instaliram alate za komandnu liniju."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:527
 msgid "Command line tools installed"
 msgstr "Alati za komandnu liniju su instalirani"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:528
 msgid "Command line tools installed in"
 msgstr "Alati za komandnu liniju su instalirani u"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:529
 msgid ""
 "If you move calibre.app, you have to re-install the command line tools."
 msgstr ""
 "Ako promenite direktorijum za calibre.app moraćete da ponovo instalirate "
 "alate za komandnu liniju."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:580
 msgid "No valid plugin path"
 msgstr "Ne postoji ispravna putanja do dodataka"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:581
 msgid "%s is not a valid plugin path"
 msgstr "%s nije ispravna putanja do dodataka"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:584
 msgid "Choose plugin"
 msgstr "Izaberite dodatak"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:596
 msgid "Plugin cannot be disabled"
 msgstr "Dodatak se ne može isključiti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:597
 msgid "The plugin: %s cannot be disabled"
 msgstr "Dodatak: %s se ne može isključiti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:606
 msgid "Plugin not customizable"
 msgstr "Dodatak nema opcija koje se mogu menjati"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:607
 msgid "Plugin: %s does not need customization"
 msgstr "Dodatak: %s ne zahteva podešavanje"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:615
 msgid "Customize"
 msgstr "Podesi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:652
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:653
 msgid "Cannot remove builtin plugin"
 msgstr "Ne mogu da uklonim ugrađeni dodatak"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:653
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:654
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 " se ne može ukloniti. Ovaj dodatak je ugrađen. Probajte da ga isključite."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:684
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:685
 msgid "You must select a column to delete it"
 msgstr "Da biste izbrisali kolonu morate je prvo izabrati"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:690
 msgid "The selected column is not a custom column"
 msgstr "Izabrana kolona nije korisnička kolona"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:690
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:691
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
 msgid "Are you sure?"
 msgstr "Da li ste sigurni?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:691
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:692
 msgid "Do you really want to delete column %s and all its data?"
 msgstr "Da li zaista želite da izbrišete kolonu %s i njen sadržaj?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:758
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:759
 msgid "Error log:"
 msgstr "Dnevnik grešaka:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:765
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:766
 msgid "Access log:"
 msgstr "Dnevnik pristupa:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:793
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:794
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:331
 msgid "Failed to start content server"
 msgstr "Nisam uspeo da pokrenem server sadržaja"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:817
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:818
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:587
 msgid "Select location for books"
 msgstr "Izaberite putanju za knjige"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:824
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:825
 msgid "Invalid size"
 msgstr "Neispravna veličina"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:825
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:826
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr "Veličina %s je neispravna. Mora biti u obliku širinaxvisina"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:884
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:889
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:891
 msgid "Invalid database location"
 msgstr "Neispravna lokacija baze podataka"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:885
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:887
 msgid "Invalid database location "
 msgstr "Neispravna lokacija baze podataka "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:888
 msgid "<br>Must be a directory."
 msgstr "<br>Mora biti direktorijum."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:890
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:892
 msgid "Invalid database location.<br>Cannot write to "
 msgstr "Neispravna lokacija baze podataka.<br>Ne mogu da pišem u "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:895
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:897
 msgid "Must restart"
 msgstr "Potrebno je ponovno pokretanje"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:896
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:898
 msgid ""
 "The changes you made require that Calibre be restarted. Please restart as "
 "soon as practical."
@@ -5482,19 +5544,19 @@ msgstr ""
 "Izmene koje ste izvršili zahtevaju da ponovo pokrenete Calibre. Molim vas da "
 "to učinite što pre."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:930
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:932
 msgid "Checking database integrity"
 msgstr "Proveravam integritet baze podataka"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:950
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:952
 msgid "Failed to check database integrity"
 msgstr "Neuspešna provera integriteta baze podataka"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:957
 msgid "Some inconsistencies found"
 msgstr "Pronađene su neke nedoslednosti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:956
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:958
 msgid ""
 "The following books had formats listed in the database that are not actually "
 "available. The entries for the formats have been removed. You should check "
@@ -5506,11 +5568,11 @@ msgstr ""
 "formate proverite i ručno. Do ove greške može doći ako ručno baratate "
 "direktorijumom koji sadrži vašu biblioteku."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:133
 msgid "TabWidget"
 msgstr "TabWidget"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:134
 msgid ""
 "Here you can control how calibre will read metadata from the files you add "
 "to it. calibre can either read metadata from the contents of the file, or "
@@ -5520,11 +5582,11 @@ msgstr ""
 "njega dodajete. Ovi podaci se mogu čitati ili iz sadržaja, ili iz imena "
 "fajla."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:135
 msgid "Read metadata only from &file name"
 msgstr "Čitaj metapodatke samo iz imena &fajla"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:136
 msgid ""
 "Swap the firstname and lastname of the author. This affects only metadata "
 "read from file names."
@@ -5532,11 +5594,11 @@ msgstr ""
 "Promeni redosled imena i prezimena autora. Ovo utiče samo na metapodatke "
 "pročitane iz imena fajla."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:137
 msgid "&Swap author firstname and lastname"
 msgstr "&Promeni redosled imena i prezimena autora"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:138
 msgid ""
 "If an existing book with a similar title and author is found that does not "
 "have the format being added, the format is added\n"
@@ -5555,7 +5617,7 @@ msgstr ""
 "\"an\"), interpunkciju, te veličinu slova. Poklapanje autora mora bit "
 "egzaktno."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:142
 msgid ""
 "If books with similar titles and authors found, &merge the new files "
 "automatically"
@@ -5563,15 +5625,15 @@ msgstr ""
 "Ako su pronađene knjige sa sličnim naslovom i autorima, automatski &dodaj  "
 "nove fajlove"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:143
 msgid "&Configure metadata from file name"
 msgstr "&Podesi metapodatke pročitane iz imena fajla"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:144
 msgid "&Adding books"
 msgstr "&Dodavanje knjiga"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:145
 msgid ""
 "Here you can control how calibre will save your books when you click the "
 "Save to Disk button:"
@@ -5579,65 +5641,78 @@ msgstr ""
 "Ovde možete upravljati načinom na koji calibre snima vaše knjige kada "
 "pritisnete dugme Snimi na disk:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:146
 msgid "Save &cover separately"
 msgstr "Snimi &naslovnu stranu u poseban fajl"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:147
 msgid "Update &metadata in saved copies"
 msgstr "Osveži &metapodatke u snimljenim kopijama"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:148
 msgid "Save metadata in &OPF file"
 msgstr "Snimi metapodatke u &OPF fajl"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:149
 msgid "Convert non-English characters to &English equivalents"
 msgstr "Konvertuj ne-engleske znake u &engleske ekvivalente"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:150
 msgid "Format &dates as:"
 msgstr "Formatiraj &datume na sledeći način:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:151
 msgid "File &formats to save:"
 msgstr "&Formati koji će biti snimljeni:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:152
 msgid "Replace space with &underscores"
 msgstr "Promeni razmake u &donje crte"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:153
 msgid "Change paths to &lowercase"
 msgstr "Promeni putanje u &mala slova"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:154
 msgid "&Saving books"
 msgstr "&Snimanje knjiga"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:135
-msgid "Preserve device collections."
-msgstr "Sačuvaj kolekcije već na uređaju."
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:155
+msgid "Metadata &management:"
+msgstr "Upravljanje &metapodacima:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:156
+msgid "Manual management"
+msgstr "Ručno upravljanje"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:157
+msgid "Only on send"
+msgstr "Samo pri slanju"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:158
+msgid "Automatic management"
+msgstr "Automatsko upravljanje"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:159
 msgid ""
-"If checked, collections will not be deleted even if a book with changed "
-"metadata is resent and the collection is not in the book's metadata. In "
-"addition, editing collections in the device view will be enabled. If "
-"unchecked, collections will be always reflect only the metadata in the "
-"calibre library."
+"<li><b>Manual Management</b>: Calibre updates the metadata and adds "
+"collections only when a book is sent. With this option, calibre will never "
+"remove a collection.</li>\n"
+"<li><b>Only on send</b>: Calibre updates metadata and adds/removes "
+"collections for a book only when it is sent to the device. </li>\n"
+"<li><b>Automatic management</b>: Calibre automatically keeps metadata on the "
+"device in sync with the calibre library, on every connect</li></ul>"
 msgstr ""
-"Ako je izabrana ova opcija, kolekcije neće biti obrisane čak i ako se ponov "
-"pošalje knjiga sa izmenjenim metapodacima gde se kolekcija ne nalazi među "
-"njima. Uz to, izmena kolekcija u pogledu na uređaj će biti omogućena. Ako "
-"opcija nije izabrana, kolekcije će uvek odslikavati samo metapodatke u "
-"calibre biblioteci."
+"<li><b>Ručno upravljanje</b>: Calibre osvežava metapodatke i dodaje "
+"kolekcije samo ak oje knjiga poslata. Sa ovom opcijom, calibre nikada neće "
+"ukloniti kolekciju.</li>\n"
+"<li><b>Samo pri salnju</b>: Calibre osvežava metapodatke i dodaje/briše "
+"kolekcije samo kada se knjiga šalje na uređaj. </li>\n"
+"<li><b>Automatsko upravljanje</b>: Calibre automatski sinhronizuje "
+"metapodatke na uređaju s calibre bibliotekom, pri svakom "
+"povezivanju.</li></ul>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:137
-msgid "  "
-msgstr "  "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:162
 msgid ""
 "Here you can control how calibre will save your books when you click the "
 "Send to Device button. This setting can be overriden for individual devices "
@@ -5648,18 +5723,19 @@ msgstr ""
 "pojedinačne uređaje podešavanjem dodataka za vezu s uređajima u Podešavanja-"
 ">Dodaci"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:163
 msgid "Sending to &device"
 msgstr "Slanje na &uređaj"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:167
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:174
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr "Podešavanja"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
@@ -5667,27 +5743,27 @@ msgstr ""
 "&Mesto za e-knjige (e-knjige se smeštaju u direktorijume sortirane po "
 "autoru, a metapodaci se snimaju u fajl metadata.db)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
 msgid "Browse for the new database location"
 msgstr "Pronađite novo mesto za bazu podataka"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
 msgid "Show notification when &new version is available"
 msgstr "Prikaži poruku ako postoji &nova verzija programa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
 msgid "Download &social metadata (tags/ratings/etc.) by default"
 msgstr "Automatski preuzmi &društvene metapodatke (etikete, ocene, itd)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
 msgid "&Overwrite author and title by default when fetching metadata"
 msgstr "Automatski &prepiši autora i naslov kada preuzimaš metapodatke"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
 msgid "Default network &timeout:"
 msgstr "Podrazumevana vrednost za čekanje na odziv &mreže:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
@@ -5695,156 +5771,160 @@ msgstr ""
 "Postavi podrazumevanu vrednost za čekanje na odziv mreže (t.j. pristup "
 "Internetu radi preuzimanja podataka)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
 msgid " seconds"
 msgstr " sekundi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
 msgid "Choose &language (requires restart):"
 msgstr "Izaberi &jezik (zahteva ponovno pokretanje programa):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
 msgid "Normal"
 msgstr "Normalan"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
 msgid "High"
 msgstr "Visok"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
 msgid "Low"
 msgstr "Nizak"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
 msgid "Job &priority:"
 msgstr "&Prioritet posla:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
 msgid "Preferred &output format:"
 msgstr "Poželjni izlazni f&ormat:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
 msgid "Preferred &input format order:"
 msgstr "Poželjan redosled ulazn&ih formata:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
 msgid "Use &Roman numerals for series number"
 msgstr "Koristi &rimske cifre za broj serije"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 "Uključi prikazivanje sis&temske ikone (zahteva ponovno startovanje programa)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
 msgid "Show &notifications in system tray"
 msgstr "Prikazuj obaveštenja u sistemskoj ikoni"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
 msgid "Show &splash screen at startup"
 msgstr "Prikaži &početni ekran pri pokretanju programa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 "Prikaži &izlog naslovnih strana u posebnom prozoru (zahteva ponovno "
 "startovanje programa)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
 msgid "Show &average ratings in the tags browser"
 msgstr "Prik&aži srednje ocene u izlogu etiketa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
 msgid "Search as you type"
 msgstr "Pretraga tokom kucanja"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr "Automatski pošalji preuzete &vesti na čitač"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
 msgid "&Delete news from library when it is automatically sent to reader"
 msgstr "&Izbriši vesti iz biblioteke kada budu automatski poslate na čitač"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 "&Broj naslovnih strana koje će biti prikazane u izlogu (zahteva ponovno "
 "startovanje programa):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
 msgid "Toolbar"
 msgstr "Traka sa alatkama"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
 msgid "Large"
 msgstr "Velika"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
 msgid "Medium"
 msgstr "Srednja"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
 msgid "Small"
 msgstr "Mala"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
 msgid "&Button size in toolbar"
 msgstr "Veličina &dugmadi u traci sa alatkama"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
 msgid "Show &text in toolbar buttons"
 msgstr "Prikaži &tekst na dugmadima u traci sa alatkama"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
 msgid "Select visible &columns in library view"
 msgstr "Izaberi vidljive &kolone u prikazu biblioteke"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
 msgid "Remove a user-defined column"
 msgstr "Ukloni korisničku kolonu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
 msgid "Add a user-defined column"
 msgstr "Dodaj korisničku kolonu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
 msgid "Edit settings of a user-defined column"
 msgstr "Promeni podešavanja za korisničku kolonu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
 msgid "Use internal &viewer for:"
 msgstr "Koristi &ugrađeni čitač za:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
 msgid "User Interface &layout (needs restart):"
 msgstr "Izg&led korisničkog interfejsa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr "Onemogući sve animacije. Korisno ako imate spor/stari računar."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
 msgid "Disable &animations"
 msgstr "Onemogući &animacije"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
+msgid "Show &donate button (restart)"
+msgstr "Prikaži &dugme za donacije (zahteva ponovno pokretanje)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
 msgid "Add an email address to which to send books"
 msgstr "Dodaj elektronsku adresu na koju će se slati knjige"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
 msgid "&Add email"
 msgstr "&Dodaj elektronsku adresu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
 msgid "Make &default"
 msgstr "Učini &podrazumevanom vrednošću"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
 msgid "&Remove email"
 msgstr "&Ukloni elektronsku adresu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
 msgid ""
 "calibre can send your books to you (or your reader) by email. Emails will be "
 "automatically sent for downloaded news to all email addresses that have Auto-"
@@ -5854,35 +5934,35 @@ msgstr ""
 "Pošta sa preuzetim vestima će biti automatski poslata na sve adrese za koje "
 "ste uključili Automatsko slanje."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
 msgid "&Maximum number of waiting worker processes (needs restart):"
 msgstr ""
 "&Maksimalan broj radnih procesa u redu za čekanje (zahteva ponovno "
 "startovanje programa):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
 msgid "&Check database integrity"
 msgstr "&Proveri integritet baze podataka"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
 msgid "&Install command line tools"
 msgstr "&Instaliraj alatke za komandnu liniju"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
 msgid "Open calibre &configuration directory"
 msgstr "Otvori direktorijum koji sadrži calibre &konfiguraciju"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
 msgid "Limit the max. simultaneous jobs to the available CPU &cores"
 msgstr ""
 "Ograniči najveći broj istovremenih poslova na broj raspoloživih &procesora "
 "(ili procesorskih jezgara)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
 msgid "Debug &device detection"
 msgstr "Traži greške u otkrivanju &uređaja"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
 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 "
@@ -5892,25 +5972,25 @@ msgstr ""
 "Interneta. Sve izmene koje ovde unesete će postati aktivne tek posle "
 "ponovnog pokretanja servera."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
 msgid "Server &port:"
 msgstr "&Port za server:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:212
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:117
 msgid "&Username:"
 msgstr "&Korisničko ime:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:213
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:119
 msgid "&Password:"
 msgstr "&Lozinka:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
@@ -5918,7 +5998,7 @@ msgstr ""
 "Ako je polje za lozinku prazno svako će moći da pristupi vašoj biblioteci "
 "preko Interneta."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
@@ -5926,45 +6006,45 @@ msgstr ""
 "Maksimalna veličina (širinaxvisina) za prikaz naslovnih strana. Veće "
 "naslovne strane će biti smanjene. "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
 msgid "Max. &cover size:"
 msgstr "Maks. veličina &naslovne strane:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:621
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:214
 msgid "&Show password"
 msgstr "&Prikaži lozinku"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
 msgid "Max. &OPDS items per query:"
 msgstr "Maks. broj &OPDS stavki po upitu:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
 msgid "Max. OPDS &ungrouped items:"
 msgstr "Maks. OPDS negr&upisane stavke:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
 msgid "&Start Server"
 msgstr "&Pokreni server"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:621
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
 msgid "St&op Server"
 msgstr "&Zaustavi server"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:626
 msgid "&Test Server"
 msgstr "&Proveri server"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
 msgid "Run server &automatically on startup"
 msgstr "&Automatski pokreni server pri pokretanju programa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:628
 msgid "View &server logs"
 msgstr "Prikaži &serverski dnevnik"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:46
 msgid ""
 "<p>Remember to leave calibre running as the server only runs as long as "
@@ -5981,7 +6061,7 @@ msgstr ""
 "na vašem iPhoneu. Ovde mojhost treba da bude puno ime ili IP adresa računara "
 "na kojem ste pokrenuli calibre."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:631
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
@@ -5989,27 +6069,27 @@ msgstr ""
 "Ovde možete promeniti ponašanje Calibrea izborom dodataka koji će biti "
 "korišćeni za:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:628
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:632
 msgid "Enable/&Disable plugin"
 msgstr "Uključi/&Isključi dodatak"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:633
 msgid "&Customize plugin"
 msgstr "&Podesi dodatak"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:630
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:634
 msgid "&Remove plugin"
 msgstr "&Ukloni dodatak"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:635
 msgid "Add new plugin"
 msgstr "Dodaj novi dodatak"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:632
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:636
 msgid "Plugin &file:"
 msgstr "&Fajl sa dodatkom:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:634
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:638
 msgid "&Add"
 msgstr "&Dodaj"
 
@@ -6047,9 +6127,9 @@ msgstr "Broj"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:31
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:884
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:889
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Date"
 msgstr "Datum"
@@ -6257,12 +6337,20 @@ msgstr "&Ponovo prikaži ovo upozorenje"
 msgid "ERROR"
 msgstr "GREŠKA"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:67
+msgid ""
+"All checked books will be <b>permanently deleted</b> from your device. "
+"Please verify the list."
+msgstr ""
+"Sve obeležene knjige će biti <b>zauvek izbrisane</b> s vašeg uređaja. Molim "
+"vas da proverite spisak."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 msgid "Location"
 msgstr "Lokacija"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1058
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1064
 msgid "Format"
 msgstr "Format"
 
@@ -7104,6 +7192,10 @@ msgstr ""
 "Dodaj etiketu u listu raspoloživih etiketa i stavi je na trenutno izabranu "
 "knjigu"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:20
+msgid "%s (was %s)"
+msgstr "%s (bilo %s)"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:501
 msgid "Item is blank"
@@ -7430,11 +7522,11 @@ msgstr "Regularni izraz (?P&lt;naslov&gt;)"
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:88
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:93
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:98
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:100
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:99
 msgid "No match"
 msgstr "Ništa nije pronađeno"
 
@@ -7474,43 +7566,43 @@ msgstr "Regularni izraz (?P<isbn>)"
 msgid "Save single format to disk..."
 msgstr "Snimi samo jedan format na disk..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:53
 msgid "Edit metadata individually"
 msgstr "Izmena pojedinačnih metapodataka"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:56
 msgid "Edit metadata in bulk"
 msgstr "Masovna izmena metapodataka"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:59
 msgid "Download metadata and covers"
 msgstr "Preuzmi metapodatke i naslovne strane"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:62
 msgid "Download only metadata"
 msgstr "Preuzmi samo metapodatke"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:64
 msgid "Download only covers"
 msgstr "Preuzmi samo naslovne strane"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:67
 msgid "Download only social metadata"
 msgstr "Preuzmi samo društvene metapodatke"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:73
 msgid "Merge into first selected book - delete others"
 msgstr "Spoji u prvu izabranu knjigu - ostale izbriši"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:76
 msgid "Merge into first selected book - keep others"
 msgstr "Spoji u prvu izabranu knjigu - ostale zadrži"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:84
 msgid "Add books from a single directory"
 msgstr "Dodaj knjige iz jednog direktorijuma"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:86
 msgid ""
 "Add books from directories, including sub-directories (One book per "
 "directory, assumes every ebook file is the same book in a different format)"
@@ -7519,7 +7611,7 @@ msgstr ""
 "po direktorijumu, podrazumeva se da su različiti fajlovi ista knjiga u "
 "različitiim formatima)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:90
 msgid ""
 "Add books from directories, including sub directories (Multiple books per "
 "directory, assumes every ebook file is a different book)"
@@ -7527,98 +7619,116 @@ msgstr ""
 "Dodaj knjige iz direktorijuma, uključujući pod-direktorijume (više knjiga po "
 "direktorijumu, podrazumeva se da je svaki fajl različita knjiga)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:93
 msgid "Add Empty book. (Book entry with no formats)"
 msgstr "Dodaj praznu knjigu. (Stavka za knjigu bez ijednog formata)."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:102
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:160
 msgid "Save to disk"
 msgstr "Snimi na disk"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Save to disk in a single directory"
 msgstr "Snimi na disk u jedan direktorijum"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:106
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:402
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:393
 msgid "Save only %s format to disk"
 msgstr "Snimi na disk samo %s format"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:110
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:396
 msgid "Save only %s format to disk in a single directory"
 msgstr "Sačuvaj samo format %s na disk u jedan direktorijum"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:119
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:166
 msgid "View"
 msgstr "Prikaži"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:121
 msgid "View specific format"
 msgstr "Prikaži određeni format"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:127
 msgid "Remove selected books"
 msgstr "Ukloni izabrane knjige"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:129
 msgid "Remove files of a specific format from selected books.."
 msgstr "Ukloni fajlove navedenih formata za izabrane knjige..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:132
 msgid "Remove all formats from selected books, except..."
 msgstr "Ukloni sve formate za izabrane knjige, osim..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:135
 msgid "Remove covers from selected books"
 msgstr "Ukloni naslovne strane izabranih knjiga"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:138
 msgid "Remove matching books from device"
 msgstr "Ukloni odgovarajuće knjige sa uređaja"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:155
 msgid "Convert individually"
 msgstr "Konvertuj pojedinačno"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:157
 msgid "Bulk convert"
 msgstr "Konvertuj masovno"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:161
 msgid "Create catalog of books in your calibre library"
 msgstr "Napravite katalog knjiga u vašoj calibre biblioteci"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:169
 msgid "Run welcome wizard"
 msgstr "Pokrenite čarobnjaka za dobrodošlicu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:191
 msgid "Similar books..."
 msgstr "Slične knjige..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:223
 msgid "Add books to library"
 msgstr "Dodaj knjige u biblioteku"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:234
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:241
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:239
 msgid "Manage collections"
 msgstr "Uredi kolekicje"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:328
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:319
 msgid "Cover Browser"
 msgstr "Izlog omota"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:337
 msgid "Tag Browser"
 msgstr "Izlog etiketa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:358
+msgid "version"
+msgstr "verzija"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:359
+msgid "created by Kovid Goyal"
+msgstr "kreirao Kovid Goyal"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:377
+msgid "Connected "
+msgstr "Priključen je "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:386
+msgid "Update found"
+msgstr "Pronađena je novija verzija"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:430
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:439
 msgid "Book Details"
 msgstr "Podaci o knjizi"
 
@@ -7681,6 +7791,235 @@ msgstr "Kliknite da vidite spisak aktivnih poslova."
 msgid " - Jobs"
 msgstr " - Poslova"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:64
+msgid ""
+"Library\n"
+"%d books"
+msgstr ""
+"Biblioteka\n"
+"%d knjiga"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:65
+msgid ""
+"Reader\n"
+"%s"
+msgstr ""
+"Čitač\n"
+"%s"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:66
+msgid ""
+"Card A\n"
+"%s"
+msgstr ""
+"Kartica A\n"
+"%s"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:67
+msgid ""
+"Card B\n"
+"%s"
+msgstr ""
+"Kartica B\n"
+"%s"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:71
+msgid "Click to see the books available on your computer"
+msgstr "Kliknite da vidite koje knjige su na raspolaganju na vašem računaru"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:74
+msgid "Click to see the books in the main memory of your reader"
+msgstr ""
+"Kliknite da vidite koje knjige su na raspolaganju u osnovnoj memoriji vašeg "
+"čitača"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:75
+msgid "Click to see the books on storage card A in your reader"
+msgstr ""
+"Kliknite da vidite koje knjige su na raspolaganju na memorijskoj kartici A "
+"vašeg čitača"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:76
+msgid "Click to see the books on storage card B in your reader"
+msgstr ""
+"Kliknite da vidite koje knjige su na raspolaganju na memorijskoj kartici B "
+"vašeg čitača"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:84
+msgid "Books located at"
+msgstr "Knjige se nalaze u"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:100
+msgid "free"
+msgstr "slobodno"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:134
+msgid ""
+"Books display will be restricted to those matching the selected saved search"
+msgstr ""
+"Prikaz knjiga će bit ograničen na knjige koje odgovaraju sačuvanoj pretrazi"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:136
+msgid "Advanced search"
+msgstr "Napredna pretraga"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:141
+msgid ""
+"<p>Search the list of books by title, author, publisher, tags, comments, "
+"etc.<br><br>Words separated by spaces are ANDed"
+msgstr ""
+"<p>Pretraži spisak knjiga po naslovu, autoru, izdavaču, etiketama, "
+"komentarima, itd.<br><br>Reči razdovjene razmacima moraju SVE biti prisutne"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:142
+msgid "Reset Quick Search"
+msgstr "Poništi brzu pretragu"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:328
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:144
+msgid "Copy current search text (instead of search name)"
+msgstr "Kopirajte tekst koji se trenutno traži (umesto imena pretrage)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:146
+msgid "Save current search under the name shown in the box"
+msgstr "Sačuvajte trenutnu pretragu pod imenom prikazanim u polju"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:148
+msgid "Delete current saved search"
+msgstr "Izaberi aktivnu sačuvanu pretragu"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:150
+msgid "Add books"
+msgstr "Dodaj knjige"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:151
+msgid "A"
+msgstr "A"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:153
+msgid "Remove books"
+msgstr "Ukloni knjige"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:154
+msgid "Del"
+msgstr "Del"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:406
+msgid "Edit meta info"
+msgstr "Uredi metapodatke"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:406
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:156
+msgid "E"
+msgstr "E"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:157
+msgid "Merge book records"
+msgstr "Spoj odrednice s knjigama"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:158
+msgid "M"
+msgstr "M"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:159
+msgid "Send to device"
+msgstr "Pošalji na uređaj"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:161
+msgid "S"
+msgstr "S"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:162
+msgid "Fetch news"
+msgstr "Preuzmi vesti"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:163
+msgid "F"
+msgstr "F"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:164
+msgid "Convert books"
+msgstr "Konvertuj knjige"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:165
+msgid "C"
+msgstr "C"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:167
+msgid "V"
+msgstr "V"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:168
+msgid "Open containing folder"
+msgstr "Otvori izvorni direktorijum"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:169
+msgid "Show book details"
+msgstr "Prikaži detalje o knjizi"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:170
+msgid "Books by same author"
+msgstr "Knjige od istog autora"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:171
+msgid "Books in this series"
+msgstr "Knjige iz iste serije"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:172
+msgid "Books by this publisher"
+msgstr "Knjige od istog izdavača"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:173
+msgid "Books with the same tags"
+msgstr "Knjige sa istim etiketama"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:176
+msgid "Ctrl+P"
+msgstr "Ctrl+P"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:177
+msgid "Help"
+msgstr "Pomoć"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:178
+msgid "Browse the calibre User Manual"
+msgstr "Otvorite calibre Korisničko uputstvo"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:179
+msgid "F1"
+msgstr "F1"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:284
 msgid "N"
 msgstr "N"
@@ -7702,29 +8041,29 @@ msgid "Rating"
 msgstr "Ocena"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:324
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1084
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr "Knjiga <font face=\"serif\">%s</font> autora %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:674
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1176
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1182
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
 msgid "The lookup/search name is \"{0}\""
 msgstr "Ime za pretragu je \"{0}\""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:886
 msgid "In Library"
 msgstr "U biblioteci"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:885
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:890
 msgid "Size"
 msgstr "Veličina"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1156
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1162
 msgid "Marked for deletion"
 msgstr "Izabrano za brisanje"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1165
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr "Kliknite dva puta da me <b>promenite</b><br><br>"
 
@@ -7768,11 +8107,11 @@ msgstr "Prikaži kolonu"
 msgid "Restore default layout"
 msgstr "Vrati podrazumevani izgled"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:524
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:525
 msgid "Not allowed"
 msgstr "Nije dozvoljeno"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:526
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
@@ -7980,158 +8319,34 @@ msgstr "pokušajte da ponovo pokrenete računar."
 msgid "try deleting the file"
 msgstr "pokušajte da izbrišete fajl"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:131
 msgid "calibre"
 msgstr "calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:133
 msgid "&Restrict to:"
 msgstr "Og&raniči na:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
-msgid ""
-"Books display will be restricted to those matching the selected saved search"
-msgstr ""
-"Prikaz knjiga će bit ograničen na knjige koje odgovaraju sačuvanoj pretrazi"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:135
 msgid "set in ui.py"
 msgstr "podesi u ui.py"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
-msgid "Advanced search"
-msgstr "Napredna pretraga"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:138
 msgid "Alt+S"
 msgstr "Alt+S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:139
 msgid "&Search:"
 msgstr "&Traži:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
-msgid ""
-"<p>Search the list of books by title, author, publisher, tags, comments, "
-"etc.<br><br>Words separated by spaces are ANDed"
-msgstr ""
-"<p>Pretraži spisak knjiga po naslovu, autoru, izdavaču, etiketama, "
-"komentarima, itd.<br><br>Reči razdovjene razmacima moraju SVE biti prisutne"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
-msgid "Reset Quick Search"
-msgstr "Poništi brzu pretragu"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
-msgid "Choose saved search or enter name for new saved search"
-msgstr "Izaberite sačuvanu pretragu, ili unesite ime za novu"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
-msgid "Copy current search text (instead of search name)"
-msgstr "Kopirajte tekst koji se trenutno traži (umesto imena pretrage)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
-msgid "Save current search under the name shown in the box"
-msgstr "Sačuvajte trenutnu pretragu pod imenom prikazanim u polju"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
-msgid "Delete current saved search"
-msgstr "Izaberi aktivnu sačuvanu pretragu"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
-msgid "Add books"
-msgstr "Dodaj knjige"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
-msgid "A"
-msgstr "A"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
-msgid "Remove books"
-msgstr "Ukloni knjige"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
-msgid "Del"
-msgstr "Del"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:155
 msgid "Edit meta information"
 msgstr "Izmeni metapodatke"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
-msgid "E"
-msgstr "E"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
-msgid "Merge book records"
-msgstr "Spoj odrednice s knjigama"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
-msgid "M"
-msgstr "M"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
-msgid "Send to device"
-msgstr "Pošalji na uređaj"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
-msgid "S"
-msgstr "S"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
-msgid "Fetch news"
-msgstr "Preuzmi vesti"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
-msgid "F"
-msgstr "F"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
-msgid "Convert E-books"
-msgstr "Konvertuj e-knjige"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
-msgid "C"
-msgstr "C"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
-msgid "V"
-msgstr "V"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
-msgid "Open containing folder"
-msgstr "Otvori izvorni direktorijum"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
-msgid "Show book details"
-msgstr "Prikaži detalje o knjizi"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
-msgid "Books by same author"
-msgstr "Knjige od istog autora"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
-msgid "Books in this series"
-msgstr "Knjige iz iste serije"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
-msgid "Books by this publisher"
-msgstr "Knjige od istog izdavača"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
-msgid "Books with the same tags"
-msgstr "Knjige sa istim etiketama"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:175
 msgid "Configure calibre"
 msgstr "Podesi calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
-msgid "Ctrl+P"
-msgstr "Ctrl+P"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:20
 msgid ""
 "Redirect console output to a dialog window (both stdout and stderr). Useful "
@@ -8160,32 +8375,41 @@ msgstr "Knjiga nema ni naslov ni ISBN broj"
 msgid "No matches found for this book"
 msgstr "Nema rezultata za ovu knjigu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:91
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:553
 msgid "Search"
 msgstr "Traži"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:313
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:315
 msgid "The selected search will be <b>permanently deleted</b>. Are you sure?"
 msgstr "Izabrana pretraga će bit <b>izbrisana zauvek</b>. Da li ste sigurni?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:357
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr "Traži (za naprednu pretragu kliknite dugme levo)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:392
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:398
 msgid "Saved Searches"
 msgstr "Sačuvane pretrage"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:406
+msgid "Choose saved search or enter name for new saved search"
+msgstr "Izaberite sačuvanu pretragu, ili unesite ime za novu"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:10
+msgid "Restrict to"
+msgstr "Ograniči na"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:48
 msgid "({0} of {1})"
 msgstr "({0} od {1})"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
 msgid "(all books)"
 msgstr "(sve knjige)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:56
 msgid "({0} of all)"
 msgstr "({0} od svih)"
 
@@ -8308,18 +8532,32 @@ msgstr "Sortiraj po popularnosti"
 msgid "Sort by average rating"
 msgstr "Sortiraj po srednjoj oceni"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:775
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:772
+msgid "Set the sort order for entries in the Tag Browser"
+msgstr "Odredite način sortiranja u Izlogu etiketa"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:778
 msgid "Match all"
 msgstr "Moraju odgovarati svi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:775
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:778
 msgid "Match any"
 msgstr "Odgovara bilo koji od"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:783
+msgid ""
+"When selecting multiple entries in the Tag Browser match any or all of them"
+msgstr ""
+"Kada je u Izlogu etiketa izabrano više stavki traži bilo koju od njih"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:787
 msgid "Manage &user categories"
 msgstr "&Uredi korisničke kategorije"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:790
+msgid "Add your own categories to the Tag Browser"
+msgstr "Dodajte sopstvene kategorije u Izlog etiketa"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182
 msgid "Convert book %d of %d (%s)"
@@ -8347,15 +8585,15 @@ msgstr "Stavljam knjige u red čekanja za masovnu konverziju"
 msgid "Queueing "
 msgstr "Stavljam u red za čekanje "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:239
 msgid "Fetch news from "
 msgstr "Preuzmi vesti sa "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:301
 msgid "Convert existing"
 msgstr "Konvertuj postojeće"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:302
 msgid ""
 "The following books have already been converted to %s format. Do you wish to "
 "reconvert them?"
@@ -8371,54 +8609,45 @@ msgstr "V&rati na ekran"
 msgid "&Donate to support calibre"
 msgstr "Pošaljite &donaciju da podržite razvoj calibre programa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:168
 msgid "&Eject connected device"
 msgstr "Isključi pov&ezani uređaj"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:173
 msgid "&Restart"
 msgstr "&Ponovo pokreni"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:206
-msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
-msgstr "<p>Za pomoć vidi: <a href=\"%s\">Korisničko uputstvo</a><br>"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:212
-msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
-msgstr ""
-"<b>%s</b>: %s autor <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:227
 msgid "Calibre Quick Start Guide"
 msgstr "Kratko uputstvo za Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:389
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:380
 msgid "Cannot configure"
 msgstr "Ne mogu da podesim"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:376
 msgid "Cannot configure while there are running jobs."
 msgstr "Ne mogu da podesim dok ima aktivnih poslova."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:381
 msgid "Cannot configure before calibre is restarted."
 msgstr "Ne mogu da podesim dok ponovo ne pokrenete calibre."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:424
 msgid "No detailed info available"
 msgstr "Ne postoje detaljne informacije"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:425
 msgid "No detailed information is available for books on the device."
 msgstr "Ne postoje detaljne informacije za knjige na uređaju."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:486
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr "Greška u konverziji"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:487
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:478
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using third party tools."
@@ -8426,29 +8655,30 @@ msgstr ""
 "<p>Nisam uspeo da konvertujem: %s<p>Knjiga je zaštićena <a "
 "href=\"%s\">DRM</a>om. Prvo morate ukloniti DRM nezavisnim alatima."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:491
 msgid "Recipe Disabled"
 msgstr "Recept je isključen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:506
 msgid "<b>Failed</b>"
 msgstr "<b>Neuspelo</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:546
 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."
+"you find it useful, please consider donating to support its development. "
+"Your donation helps keep calibre development going."
 msgstr ""
-"je rezultat rada velikog broja dobrovoljaca sa svih strana sveta. Ako "
-"mislite da je koristan molim vas da razmotrite donaciju kako bi podržali "
-"dalji razvoj."
+"je rezultat napora mnogih dobrovoljaca širom sveta. Ako mislite da vam je od "
+"koristi molim vas da razmislite o mogućnosti da napravite donaciju u korist "
+"daljeg razvoja. Vaše donacije pomažu da se razvoj calibrea nastavi."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:572
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 "Još uvek ima aktivnih poslova. Da li ste sigurni da želite da prekinete rad?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:575
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
@@ -8459,11 +8689,11 @@ msgstr ""
 "uređaju.<br>\n"
 "                      Da li ste sigurni da želite da prekinete rad?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:579
 msgid "WARNING: Active jobs"
 msgstr "UPOZORENJE: Aktivni poslovi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:640
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:632
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -8471,19 +8701,11 @@ msgstr ""
 "će nastaviti da radi kao sistemska ikona. Da prekinete rad izaberite "
 "<b>Izlaz</b> u meniju."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/update.py:52
-msgid ""
-"<span style=\"color:red; font-weight:bold\">Latest version: <a "
-"href=\"%s\">%s</a></span>"
-msgstr ""
-"<span style=\"color:red; font-weight:bold\">Najnovija verzija: <a "
-"href=\"%s\">%s</a></span>"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/update.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:56
 msgid "Update available"
 msgstr "Nova verzija je na raspolaganju"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/update.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:57
 msgid ""
 "%s has been updated to version %s. See the <a href=\"http://calibre-"
 "ebook.com/whats-new\">new features</a>. Visit the download page?"
@@ -8963,109 +9185,43 @@ msgstr "Shift+F3"
 msgid "Print eBook"
 msgstr "Štampaj e-knjigu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
 msgid "Copy Image"
 msgstr "Kopiraj sliku"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:240
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:239
 msgid "Paste Image"
 msgstr "Ubaci sliku"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:270
-msgid ""
-"Library\n"
-"%d\n"
-"books"
-msgstr ""
-"Biblioteka\n"
-"%d\n"
-"knjiga"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:271
-msgid ""
-"Reader\n"
-"%s\n"
-"available"
-msgstr ""
-"Čitač\n"
-"%s\n"
-"je na raspolaganju"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:272
-msgid ""
-"Card A\n"
-"%s\n"
-"available"
-msgstr ""
-"Memorijska kartica A\n"
-"%s\n"
-"je na raspolaganju"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:273
-msgid ""
-"Card B\n"
-"%s\n"
-"available"
-msgstr ""
-"Memorijska kartica B\n"
-"%s\n"
-"je na raspolaganju"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:277
-msgid "Click to see the books available on your computer"
-msgstr "Kliknite da vidite koje knjige su na raspolaganju na vašem računaru"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:280
-msgid "Click to see the books in the main memory of your reader"
-msgstr ""
-"Kliknite da vidite koje knjige su na raspolaganju u osnovnoj memoriji vašeg "
-"čitača"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:281
-msgid "Click to see the books on storage card A in your reader"
-msgstr ""
-"Kliknite da vidite koje knjige su na raspolaganju na memorijskoj kartici A "
-"vašeg čitača"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:282
-msgid "Click to see the books on storage card B in your reader"
-msgstr ""
-"Kliknite da vidite koje knjige su na raspolaganju na memorijskoj kartici B "
-"vašeg čitača"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:290
-msgid "Books located at"
-msgstr "Knjige se nalaze u"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:364
 msgid "Change Case"
 msgstr "Promeni veličinu slova"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:365
 msgid "Upper Case"
 msgstr "Velika slova"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:366
 msgid "Lower Case"
 msgstr "Mala slova"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:367
 msgid "Swap Case"
 msgstr "Zameni velika slova u mala, i obrnuto"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:368
 msgid "Title Case"
 msgstr "Veličina slova za naslov"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:974
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:837
 msgid "Drag to resize"
 msgstr "Povuci za promenu veličine"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:869
 msgid "Show"
 msgstr "Prikaži"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1012
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:876
 msgid "Hide"
 msgstr "Sakrij"
 
@@ -10416,9 +10572,8 @@ msgid "User-created tag browser categories"
 msgstr "Korisničke kategorije za izlog etiketa"
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:702
-msgid "Preserve all collections even if not in library metadata."
-msgstr ""
-"Sačuvaj sve kolekcije čak i ako ne postoje u metapodacima u biblioteci"
+msgid "How and when calibre updates metadata on the device."
+msgstr "Kako i kada će calibre osvežiti metapodatke na uređaju."
 
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:43
 msgid "Waiting..."
@@ -10589,85 +10744,85 @@ msgstr "Nepoznat izvor vesti"
 msgid "The \"%s\" recipe needs a username and password."
 msgstr "Recept \"%s\" zahteva korisničko ime i lozinku"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:706
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:708
 msgid "Download finished"
 msgstr "Preuzimanje gotovo"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:708
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:710
 msgid "Failed to download the following articles:"
 msgstr "Nisam uspeo da preuzmem sledeće članke:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:714
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:716
 msgid "Failed to download parts of the following articles:"
 msgstr "Nisam uspeo da preuzmem delove sledećih članaka:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:716
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:718
 msgid " from "
 msgstr " sa "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:718
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:720
 msgid "\tFailed links:"
 msgstr "\tNeuspele veze:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:807
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:809
 msgid "Could not fetch article. Run with -vv to see the reason"
 msgstr ""
 "Nisam mogao da preuzmem članak. Probajte ponovo sa opcijom -vv da biste "
 "saznali razlog"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:828
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:830
 msgid "Fetching feeds..."
 msgstr "Preuzimam izvore..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:833
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:835
 msgid "Got feeds from index page"
 msgstr "Dobio sam izvore s osnovne strane..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:839
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:841
 msgid "Trying to download cover..."
 msgstr "Pokušavam da preuzmem naslovnu stranu..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:841
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Generating masthead..."
 msgstr "Generišem impresum..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:922
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:924
 msgid "Starting download [%d thread(s)]..."
 msgstr "Počinjem preuzimanje [%d niti]..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:938
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:940
 msgid "Feeds downloaded to %s"
 msgstr "Izvori su preuzeti u %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:948
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:950
 msgid "Could not download cover: %s"
 msgstr "Nisam uspeo da preuzmem naslovnu stranu: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:960
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
 msgid "Downloading cover from %s"
 msgstr "Preuzimam naslovnu stranu sa %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1002
 msgid "Masthead image downloaded"
 msgstr "Preuzeo sam sliku za impresum"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1190
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1192
 msgid "Untitled Article"
 msgstr "Članak bez imena"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1261
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1263
 msgid "Article downloaded: %s"
 msgstr "Preuzeo sam članak: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1272
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1274
 msgid "Article download failed: %s"
 msgstr "Nije uspelo preuzimanje članka: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1289
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1291
 msgid "Fetching feed"
 msgstr "Preuzimam izvor"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1436
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1438
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
@@ -10675,7 +10830,7 @@ msgstr ""
 "Neuspelo prijavljivanje. Proverite korisničko ime i lozinku vašeg calibre "
 "servisa za periodiku."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1452
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1454
 msgid ""
 "You do not have permission to download this issue. Either your subscription "
 "has expired or you have exceeded the maximum allowed downloads for today."
@@ -10825,6 +10980,12 @@ msgstr "Ne preuzimaj CSS stilove."
 #~ msgid "Sort by &popularity"
 #~ msgstr "Sortiraj po &popularnosti"
 
+#~ msgid "Convert E-books"
+#~ msgstr "Konvertuj e-knjige"
+
+#~ msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
+#~ msgstr "<p>Za pomoć vidi: <a href=\"%s\">Korisničko uputstvo</a><br>"
+
 #~ msgid "Click to browse books by their covers"
 #~ msgstr "Kliknite da izaberete knjigu po naslovnoj strani"
 
@@ -10840,9 +11001,60 @@ msgstr "Ne preuzimaj CSS stilove."
 #~ msgid "Could not access %s. Using %s as the library."
 #~ msgstr "Ne mogu da pristupim %s. Koristim %s kao biblioteku."
 
+#~ msgid ""
+#~ "<span style=\"color:red; font-weight:bold\">Latest version: <a "
+#~ "href=\"%s\">%s</a></span>"
+#~ msgstr ""
+#~ "<span style=\"color:red; font-weight:bold\">Najnovija verzija: <a "
+#~ "href=\"%s\">%s</a></span>"
+
+#~ 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 ""
+#~ "je rezultat rada velikog broja dobrovoljaca sa svih strana sveta. Ako "
+#~ "mislite da je koristan molim vas da razmotrite donaciju kako bi podržali "
+#~ "dalji razvoj."
+
 #~ msgid "Ebook Viewer"
 #~ msgstr "Čitač e-knjiga"
 
+#~ msgid ""
+#~ "Card B\n"
+#~ "%s\n"
+#~ "available"
+#~ msgstr ""
+#~ "Memorijska kartica B\n"
+#~ "%s\n"
+#~ "je na raspolaganju"
+
+#~ msgid ""
+#~ "Card A\n"
+#~ "%s\n"
+#~ "available"
+#~ msgstr ""
+#~ "Memorijska kartica A\n"
+#~ "%s\n"
+#~ "je na raspolaganju"
+
+#~ msgid ""
+#~ "Reader\n"
+#~ "%s\n"
+#~ "available"
+#~ msgstr ""
+#~ "Čitač\n"
+#~ "%s\n"
+#~ "je na raspolaganju"
+
+#~ msgid ""
+#~ "Library\n"
+#~ "%d\n"
+#~ "books"
+#~ msgstr ""
+#~ "Biblioteka\n"
+#~ "%d\n"
+#~ "knjiga"
+
 #~ msgid ""
 #~ "The format in which to output the data. Available choices: %s. Defaults is "
 #~ "text."
@@ -10924,6 +11136,10 @@ msgstr "Ne preuzimaj CSS stilove."
 #~ "Sličnost naslova ne zavisi od vodećih članova (\"the\", \"a\", \"an\"), "
 #~ "interpunkcije, veličine slova, itd. Imena autora moraju biti identična."
 
+#~ msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
+#~ msgstr ""
+#~ "<b>%s</b>: %s autor <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
+
 #~ msgid "(%d found)"
 #~ msgstr "(pronađeno %d)"
 
@@ -11024,3 +11240,26 @@ msgstr "Ne preuzimaj CSS stilove."
 
 #~ msgid "Connect to iTunes (EXPERIMENTAL)"
 #~ msgstr "Uspostavi komunikaciju sa iTunes (EKSPERIMENTALNO)"
+
+#~ msgid "Preserve all collections even if not in library metadata."
+#~ msgstr ""
+#~ "Sačuvaj sve kolekcije čak i ako ne postoje u metapodacima u biblioteci"
+
+#~ msgid "Preserve device collections."
+#~ msgstr "Sačuvaj kolekcije već na uređaju."
+
+#~ msgid ""
+#~ "If checked, collections will not be deleted even if a book with changed "
+#~ "metadata is resent and the collection is not in the book's metadata. In "
+#~ "addition, editing collections in the device view will be enabled. If "
+#~ "unchecked, collections will be always reflect only the metadata in the "
+#~ "calibre library."
+#~ msgstr ""
+#~ "Ako je izabrana ova opcija, kolekcije neće biti obrisane čak i ako se ponov "
+#~ "pošalje knjiga sa izmenjenim metapodacima gde se kolekcija ne nalazi među "
+#~ "njima. Uz to, izmena kolekcija u pogledu na uređaj će biti omogućena. Ako "
+#~ "opcija nije izabrana, kolekcije će uvek odslikavati samo metapodatke u "
+#~ "calibre biblioteci."
+
+#~ msgid "  "
+#~ msgstr "  "
diff --git a/src/calibre/translations/sv.po b/src/calibre/translations/sv.po
index 7e4061129f..31c974b456 100644
--- a/src/calibre/translations/sv.po
+++ b/src/calibre/translations/sv.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-07-03 01:21+0000\n"
-"PO-Revision-Date: 2010-07-05 16:04+0000\n"
+"POT-Creation-Date: 2010-07-10 16:12+0000\n"
+"PO-Revision-Date: 2010-07-13 20:25+0000\n"
 "Last-Translator: Johan Segerstedt <Unknown>\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: 2010-07-06 03:36+0000\n"
+"X-Launchpad-Export-Date: 2010-07-14 03:35+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: SWEDEN\n"
 "X-Poedit-Language: Swedish\n"
@@ -29,10 +29,10 @@ msgstr "Gör ingenting"
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:71
 #: /home/kovid/work/calibre/src/calibre/devices/prs500/books.py:267
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:466
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:396
-#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:98
-#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:101
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:492
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:398
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:97
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:100
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/metadata.py:56
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:428
 #: /home/kovid/work/calibre/src/calibre/ebooks/fb2/input.py:67
@@ -74,9 +74,9 @@ msgstr "Gör ingenting"
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:818
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:49
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:51
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:910
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:915
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:981
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:911
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:916
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:982
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:137
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:139
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:108
@@ -104,20 +104,20 @@ msgstr "Gör ingenting"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:233
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:290
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:815
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:818
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:814
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:817
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:172
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:179
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:22
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:135
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:903
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:912
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1192
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1195
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:899
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:908
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1191
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1194
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:120
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:155
@@ -125,8 +125,8 @@ msgstr "Gör ingenting"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:172
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:362
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:877
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1054
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:882
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1060
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:87
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:92
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:185
@@ -172,7 +172,7 @@ msgstr "Skrivare för metadata"
 msgid "Catalog generator"
 msgstr "Kataloggenerator"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:15
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:16
 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 "
@@ -182,7 +182,7 @@ msgstr ""
 "alla länkade filer. Detta tillägg körs varje gång du lägger till en HTML-fil "
 "till biblioteket."
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:51
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:52
 msgid ""
 "Character encoding for the input HTML files. Common choices include: cp1252, "
 "latin1, iso-8859-1 and utf-8."
@@ -190,7 +190,7 @@ msgstr ""
 "Teckenkodning för indata i HTML. Vanliga alternativ är: cp1252, latin1, iso-"
 "8859-1 och utf-8."
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:58
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:59
 msgid ""
 "Create a PMLZ archive containing the PML file and all images in the "
 "directory pmlname_img or images. This plugin is run every time you add a PML "
@@ -200,49 +200,49 @@ msgstr ""
 "pmlname_img eller bilder. Detta tillägg körs varje gång du lägger till en "
 "PML-fil till biblioteket."
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:90
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:93
 msgid "Extract cover from comic files"
 msgstr "Extrahera omslag från serietidningsfiler"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:117
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:128
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:140
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:150
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:160
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:171
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:181
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:191
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:201
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:211
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:221
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:232
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:243
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:255
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:276
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:287
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:297
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:307
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:120
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:131
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:153
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:163
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:174
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:184
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:194
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:204
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:214
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:224
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:235
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:246
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:258
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:279
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:290
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:300
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:310
 msgid "Read metadata from %s files"
 msgstr "Läs metadata från %s-filer"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:266
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:269
 msgid "Read metadata from ebooks in RAR archives"
 msgstr "Läs metadata från eböcker i RAR-arkiv"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:318
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:321
 msgid "Read metadata from ebooks in ZIP archives"
 msgstr "Läs metadata från eböcker i ZIP-arkiv"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:331
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:341
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:351
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:373
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:384
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:394
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:334
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:344
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:354
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:376
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:387
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:397
 msgid "Set metadata in %s files"
 msgstr "Ställ in metadata i %s-filer"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:362
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:365
 msgid "Set metadata from %s files"
 msgstr "Ställ in metadata utifrån %s-filer"
 
@@ -399,35 +399,35 @@ msgstr ""
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr "Denna profil är avsedd för Amazon Kindle DX."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:31
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
 msgid "Installed plugins"
 msgstr "Installerade tillägg"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:33
 msgid "Mapping for filetype plugins"
 msgstr "Kopplingar mellan tillägg och filändelser"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:33
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:34
 msgid "Local plugin customization"
 msgstr "Anpassa tillägg lokalt"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:34
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
 msgid "Disabled plugins"
 msgstr "Inaktiverade tillägg"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
 msgid "Enabled plugins"
 msgstr "Aktiverade tillägg"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:83
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:84
 msgid "No valid plugin found in "
 msgstr "Inget giltigt tillägg hittades i "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:460
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:468
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr "Tillägget %s kunde inte startas. Information om felet:"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:493
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
 msgid ""
 "    %prog options\n"
 "\n"
@@ -439,18 +439,18 @@ msgstr ""
 "    Anpassa calibre genom att ladda externa tillägg.\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:499
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr ""
 "Installera ett tillägg genom att ange sökvägen till zip-filen som innehåller "
 "detta."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 "Ta bort ett tillägg utifrån dess namn. Har ingen effekt på inbyggda tillägg"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:503
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:511
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
@@ -458,15 +458,15 @@ msgstr ""
 "Anpassa tillägg. Ange tilläggets namn och anpassningssträngen åtskilda av "
 "ett kommatecken."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:505
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:513
 msgid "List all installed plugins"
 msgstr "Lista alla installerade tillägg"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Enable the named plugin"
 msgstr "Aktivera namngivet tillägg"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Disable the named plugin"
 msgstr "Inaktivera namngivet tillägg"
 
@@ -624,7 +624,7 @@ msgstr "Kommunicera med läsplattan Hanlin V5."
 msgid "Communicate with the BOOX eBook reader."
 msgstr "Kommunicera med läsplattan BOOX."
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:121
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:123
 msgid ""
 "Comma separated list of directories to send e-books to on the device. The "
 "first one that exists will be used."
@@ -697,34 +697,34 @@ msgstr "Kommunicera med läsplattan Kobo"
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:51
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:54
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:57
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:157
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:159
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:64
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:67
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:70
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:130
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:137
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:160
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:139
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:162
 msgid "Getting list of books on device..."
 msgstr "Hämtar en lista över böcker på enheten..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:218
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:258
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:244
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:262
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:219
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:263
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:246
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:264
 msgid "Removing books from device..."
 msgstr "Tar bort böcker från enheten..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:262
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:269
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:269
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:274
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:267
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:274
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:271
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:276
 msgid "Removing books from device metadata listing..."
 msgstr "Ta bort böcker från enhetens metadatalista..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:274
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:308
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:208
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:238
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:313
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:210
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:240
 msgid "Adding books to device metadata listing..."
 msgstr "Lägger till böcker till enhetens metadatalista..."
 
@@ -740,6 +740,10 @@ msgstr "Kommunicera med Booq Avant"
 msgid "Communicate with the Sweex MM300"
 msgstr "Kommunicera med Sweex MM300"
 
+#: /home/kovid/work/calibre/src/calibre/devices/misc.py:75
+msgid "Communicate with the Pandigital Novel"
+msgstr "Kommunicera med Pandigital Novel"
+
 #: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:17
 msgid "Communicate with the Nokia 770 internet tablet."
 msgstr "Kommunicera med surfplattan Nokia 770."
@@ -889,12 +893,12 @@ msgstr "Kommunicera med en läsplatta."
 msgid "Get device information..."
 msgstr "Hämta enhetsinformation..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:188
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:192
 msgid "Transferring books to device..."
 msgstr "Överför böcker till enheten..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:305
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:307
 msgid "Sending metadata to device..."
 msgstr "Skickar metadata till enheten..."
 
@@ -1649,6 +1653,63 @@ msgstr "Omformar e-boken..."
 msgid "Creating"
 msgstr "Skapar"
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/__init__.py:18
+msgid "ePub Fixer"
+msgstr "ePub-fixare"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/epubcheck.py:18
+msgid "Workaround epubcheck bugs"
+msgstr "Kringgå epubchecks buggar"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/epubcheck.py:22
+msgid ""
+"Workarounds for bugs in the latest release of epubcheck. epubcheck reports "
+"many things as errors that are not actually errors. epub-fix will try to "
+"detect these and replace them with constructs that epubcheck likes. This may "
+"cause significant changes to your epub, complain to the epubcheck project."
+msgstr ""
+"Sätt att kringgå buggarna i den senaste versionen av epubcheck. Epubcheck "
+"upptäcker många fel som egentligen inte finns, och när epubcheck försöker "
+"ändra på dem kan din epub-fil förändras markant. Eventuella klagomål riktas "
+"till epubcheck-projektet."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:19
+msgid ""
+"%prog [options] file.epub\n"
+"\n"
+"Fix common problems in EPUB files that can cause them to be rejected by "
+"poorly designed publishing services.\n"
+"\n"
+"By default, no fixing is done and messages are printed out for each error "
+"detected. Use the options to control which errors are automatically fixed."
+msgstr ""
+"%prog [options] file.epub\n"
+"\n"
+"Fixar vanliga problem i epubfiler. Används om filen inte godtas av dåligt "
+"utformade publiceringsverktyg.\n"
+"\n"
+"Grundinställningen är att inga problem fixas och att ett meddelande skrivs "
+"ut för varje upptäckt fel. Använd alternativen för att kontroller vilka fel "
+"som skall rättas till automatiskt."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:50
+msgid "You must specify an epub file"
+msgstr "Du måste ange en epub-fil"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:17
+msgid "Fix unmanifested files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:21
+msgid ""
+"Fix unmanifested files. epub-fix can either add them to the manifest or "
+"delete them as specified by the delete unmanifested option."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:32
+msgid "Delete unmanifested files instead of adding them to the manifest"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:56
 msgid ""
 "Extract the contents of the generated EPUB file to the specified directory. "
@@ -2018,11 +2079,11 @@ msgstr "Serietidning"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:98
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:882
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:887
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:543
 msgid "Title"
 msgstr "Titel"
@@ -2031,7 +2092,7 @@ msgstr "Titel"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:364
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:883
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:888
 msgid "Author(s)"
 msgstr "Författare"
 
@@ -2054,7 +2115,7 @@ msgstr "Producent"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:67
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:318
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1073
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1079
 msgid "Comments"
 msgstr "Kommentarer"
 
@@ -2063,7 +2124,7 @@ msgstr "Kommentarer"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:306
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1069
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1075
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:139
 msgid "Tags"
 msgstr "Etiketter"
@@ -2073,7 +2134,7 @@ msgstr "Etiketter"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:323
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1084
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:87
 msgid "Series"
 msgstr "Serie"
@@ -2083,7 +2144,7 @@ msgid "Language"
 msgstr "Språk"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:406
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1067
 msgid "Timestamp"
 msgstr "Tidsstämpel"
 
@@ -2350,7 +2411,7 @@ msgstr ""
 "LibraryThing.com\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1226
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1398
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1399
 msgid "Cover"
 msgstr "Omslag"
 
@@ -2392,70 +2453,70 @@ msgstr "Alla artiklar"
 msgid "This is an Amazon Topaz book. It cannot be processed."
 msgstr "Det här är en Amazon Topaz-bok. Den kan inte hanteras."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1399
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1400
 msgid "Title Page"
 msgstr "Titelsida"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1400
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1401
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:15
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:53
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:194
 msgid "Table of Contents"
 msgstr "Innehållsförteckning"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1401
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1402
 msgid "Index"
 msgstr "Översikt"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1402
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1403
 msgid "Glossary"
 msgstr "Ordförklaringar"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1403
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1404
 msgid "Acknowledgements"
 msgstr "Tack till"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1404
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1405
 msgid "Bibliography"
 msgstr "Litteraturförteckning"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1405
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1406
 msgid "Colophon"
 msgstr "Kolofon"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1406
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1407
 msgid "Copyright"
 msgstr "Upphovsrätt"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1407
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1408
 msgid "Dedication"
 msgstr "Tillägnan"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1408
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1409
 msgid "Epigraph"
 msgstr "Epigraf"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1409
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1410
 msgid "Foreword"
 msgstr "Förord"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1410
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1411
 msgid "List of Illustrations"
 msgstr "Illustrationslista"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1411
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1412
 msgid "List of Tables"
 msgstr "Tabellista"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1412
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1413
 msgid "Notes"
 msgstr "Anteckningar"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1413
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1414
 msgid "Preface"
 msgstr "Förord"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1414
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1415
 msgid "Main Text"
 msgstr "Huvudtext"
 
@@ -2502,7 +2563,7 @@ msgstr "Sidram"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:22
 #: /home/kovid/work/calibre/src/calibre/ebooks/tcr/input.py:23
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:23
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:24
 msgid ""
 "Normally calibre treats blank lines as paragraph markers. With this option "
 "it will assume that every line represents a paragraph instead."
@@ -2512,7 +2573,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:26
 #: /home/kovid/work/calibre/src/calibre/ebooks/tcr/input.py:27
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:27
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:28
 msgid ""
 "Normally calibre treats blank lines as paragraph markers. With this option "
 "it will assume that every line starting with an indent (either a tab or 2+ "
@@ -2680,7 +2741,7 @@ msgstr ""
 "Få info om en PDF-fil.\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
 msgid "Author"
 msgstr "Författare"
@@ -2852,7 +2913,7 @@ msgstr ""
 "komprimeringen men snabbaste komprimeringen, och 10 är den högsta och "
 "långsammaste komprimeringen."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:33
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:34
 msgid ""
 "Normally extra spaces are condensed into a single space. With this option "
 "all spaces will be displayed."
@@ -2860,7 +2921,7 @@ msgstr ""
 "Normalt extra mellanrum sammanställs till ett enda blanksteg. Med detta "
 "alternativ att alla utrymmen som kommer att visas."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:36
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:37
 msgid ""
 "Run the text input through the markdown pre-processor. To learn more about "
 "markdown see"
@@ -2868,7 +2929,7 @@ msgstr ""
 "Kör textinmatning genom \"markdown\" pre-processor. Om du vill veta mer om "
 "\"markdown\" se"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:39
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:40
 msgid "Do not insert a Table of Contents into the output text."
 msgstr "Infoga ingen innehållsförteckning i den skapade texten."
 
@@ -3047,7 +3108,7 @@ msgstr "Kopiera"
 msgid "Copy to Clipboard"
 msgstr "Kopiera till urklipp"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:400
 msgid "Choose Files"
 msgstr "Välj filer"
 
@@ -3062,13 +3123,13 @@ msgid "User annotations generated from main library only"
 msgstr "Användaranteckningar genereras endast från huvudbiblioteket"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:75
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:612
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:671
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:708
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:729
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:877
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1060
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:670
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:707
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:728
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:876
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:941
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1059
 msgid "No books selected"
 msgstr "Inga böcker har valts"
 
@@ -3108,144 +3169,144 @@ msgstr "Hur många tomma böcker?"
 msgid "How many empty books should be added?"
 msgstr "Hur många tomma böcker ska läggas till?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:340
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:390
 msgid "Uploading books to device."
 msgstr "Skickar böcker till enhet."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:350
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:137
 msgid "Books"
 msgstr "Böcker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
 msgid "EPUB Books"
 msgstr "EPUB-böcker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
 msgid "LRF Books"
 msgstr "LRF-böcker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
 msgid "HTML Books"
 msgstr "HTML-böcker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
 msgid "LIT Books"
 msgstr "LIT-böcker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
 msgid "MOBI Books"
 msgstr "MOBI-böcker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
 msgid "Topaz books"
 msgstr "Topaz-böcker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
 msgid "Text books"
 msgstr "Textböcker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:359
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
 msgid "PDF Books"
 msgstr "PDF-böcker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:359
 msgid "Comics"
 msgstr "Serier"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:360
 msgid "Archives"
 msgstr "Arkiv"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:364
 msgid "Supported books"
 msgstr "Stödda böcker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:399
 msgid "Merged some books"
 msgstr "Sammanfoga flera böcker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:401
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:400
 msgid ""
 "Some duplicates were found and merged into the following existing books:"
 msgstr ""
 "Vissa dubbletter hittades och fördes in i följande existerande böcker:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:409
 msgid "Failed to read metadata"
 msgstr "Kunde inte läsa metadata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:410
 msgid "Failed to read metadata from the following"
 msgstr "Kunde inte läsa metadata från följande"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:434
 msgid "Add to library"
 msgstr "Lägg till i biblioteket"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:460
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1229
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:459
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1228
 msgid "No book selected"
 msgstr "Inga böcker har valts"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:434
 msgid "No book files found"
 msgstr "Inga bokfiler hittades"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:456
 msgid "Cannot delete"
 msgstr "Kan inte ta bort"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:469
 msgid "Choose formats to be deleted"
 msgstr "Välj format att ta bort"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:488
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:487
 msgid "Choose formats <b>not</b> to be deleted"
 msgstr "Välj format att <b>inte</b> ta bort"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:507
 msgid "Cannot delete books"
 msgstr "Kan ej ta bort böcker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:509
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:508
 msgid "No device is connected"
 msgstr "Ingen enhet ansluten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:519
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:518
 msgid "Main memory"
 msgstr "Inbyggt minne"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:520
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:444
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:519
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:454
 msgid "Storage Card A"
 msgstr "Minneskort A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:521
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:446
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:455
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:447
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:456
 msgid "Storage Card B"
 msgstr "Minneskort B"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:525
 msgid "No books to delete"
 msgstr "Inga böcker att ta bort"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:526
 msgid "None of the selected books are on the device"
 msgstr "Inga av de valda böckerna finns på enheten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:544
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:600
 msgid "Deleting books from device."
 msgstr "Tar bort böcker från enheten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:564
 msgid ""
 "The selected books will be <b>permanently deleted</b> and the files removed "
 "from your computer. Are you sure?"
@@ -3253,7 +3314,7 @@ msgstr ""
 "De valda böckerna kommer att <b>tas bort permanent</b> och filerna kommer "
 "att raderas från datorn. Är du säker?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:585
 msgid ""
 "The selected books will be <b>permanently deleted</b> from your device. Are "
 "you sure?"
@@ -3261,61 +3322,61 @@ msgstr ""
 "De utvalda böckerna kommer att <b> tas bort permanent </b> från enheten. Är "
 "du säker?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:610
 msgid "Cannot download metadata"
 msgstr "Kan inte hämta metadata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:627
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
 msgid "social metadata"
 msgstr "sociala metadata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
 msgid "covers"
 msgstr "omslag"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
 msgid "metadata"
 msgstr "metadata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:630
 msgid "Downloading %s for %d book(s)"
 msgstr "Hämtar %s för %d böcker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:654
 msgid "Failed to download some metadata"
 msgstr "Alla metadata kunde inte hämtas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:656
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
 msgid "Failed to download metadata for the following:"
 msgstr "Kunde inte hämta metadata för följande:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:659
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:658
 msgid "Failed to download metadata:"
 msgstr "Kunde inte hämta metadata:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:660
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:637
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:522
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:949
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:659
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:638
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:951
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
 msgid "Error"
 msgstr "Fel"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:670
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:707
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:669
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:706
 msgid "Cannot edit metadata"
 msgstr "Kan inte redigera metadata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:728
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:731
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:727
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:730
 msgid "Cannot merge books"
 msgstr "Kan inte sammanfoga böcker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:732
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:731
 msgid "At least two books must be selected for merging"
 msgstr "Minst två böcker måste väljas för att de skall fogas samman"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:736
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:735
 msgid ""
 "All book formats and metadata from the selected books will be added to the "
 "<b>first selected book.</b><br><br> The second and subsequently selected "
@@ -3327,7 +3388,7 @@ msgstr ""
 "kommer inte att tas bort eller ändras.<br><br>Vänligen bekräfta att du vill "
 "fortsätta."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:747
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:746
 msgid ""
 "All book formats and metadata from the selected books will be merged into "
 "the <b>first selected book</b>.<br><br>After merger the second and "
@@ -3343,7 +3404,7 @@ msgstr ""
 "böcker kommer att <b>tas bort permanent</b>från din dator.<br><br> Är du "
 "<b>säker</b> på att du vill fortsätta?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:759
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:758
 msgid ""
 "You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
 "proceed?"
@@ -3351,45 +3412,45 @@ msgstr ""
 "Du håller på att sammanfoga fler än fem böcker. Är du <b>säker</b> på att du "
 "vill fortsätta?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:876
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:875
 msgid "Cannot save to disk"
 msgstr "Kan inte spara till disk"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:878
 msgid "Choose destination directory"
 msgstr "Välj målmapp"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:912
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:911
 msgid "Error while saving"
 msgstr "Fel uppstod när filen skulle sparas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:913
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:912
 msgid "There was an error while saving."
 msgstr "Det uppstod ett fel när filen skulle sparas"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:919
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:920
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:921
 msgid "Could not save some books"
 msgstr "Vissa böcker kunde inte sparas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:922
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:921
 msgid "Click the show details button to see which ones."
 msgstr "Klicka på knappen \"Visa detaljer\" för att se vilka."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
 msgid "No books selected to generate catalog for"
 msgstr "Inga böcker har valts att skapa katalog"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:960
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:959
 msgid "Generating %s catalog..."
 msgstr "Skapar %s-katalog..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:965
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:964
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:264
 msgid "No books found"
 msgstr "Inga böcker hittades"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:966
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:965
 msgid ""
 "No books to catalog\n"
 "Check exclude tags"
@@ -3397,49 +3458,49 @@ msgstr ""
 "Inga böcker till katalog\n"
 "Kontrollera uteslutna etiketter"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:976
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:975
 msgid "Catalog generated."
 msgstr "Katalog genererad."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:979
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:978
 msgid "Export Catalog Directory"
 msgstr "Exportkatalog"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:980
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:979
 msgid "Select destination for %s.%s"
 msgstr "Välj destination för %s.%s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:996
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:995
 msgid "Fetching news from "
 msgstr "Hämtar nyheter från "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1009
 msgid " fetched."
 msgstr " hämtade."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1059
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1058
 msgid "Cannot convert"
 msgstr "Kan inte konvertera"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1088
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1087
 msgid "Starting conversion of %d book(s)"
 msgstr "Påbörjar konvertering av %d böcker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1265
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1264
 msgid "Cannot view"
 msgstr "Kan inte visa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1209
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
 msgid "Choose the format to view"
 msgstr "Välj format att visa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1218
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1217
 msgid "Multiple Books Selected"
 msgstr "Flera böcker valda"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1219
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1218
 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 "
@@ -3451,11 +3512,11 @@ msgstr ""
 "väl process startats kan den inte stoppas förrän den är klar. Vill du "
 "fortsätta?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1227
 msgid "Cannot open folder"
 msgstr "Kan inte öppna mapp"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1266
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1265
 msgid "%s has no available formats."
 msgstr "%s har inga tillgängliga format."
 
@@ -3480,7 +3541,7 @@ msgid "The specified directory could not be processed."
 msgstr "Den angivna katalogen kunde inte behandlas."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:845
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr "Inga böcker"
 
@@ -3619,15 +3680,15 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:52
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:633
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:637
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:366
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:371
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:385
@@ -3651,12 +3712,12 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:259
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:265
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:186
@@ -3688,8 +3749,9 @@ msgstr "Flera böcker per &mapp, antar varje ebokfil är en annorlunda bok"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:313
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1059
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1065
 msgid "Path"
 msgstr "Sökväg"
 
@@ -3706,8 +3768,8 @@ msgid "Formats"
 msgstr "Format"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:25
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:886
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1062
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:891
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1068
 msgid "Collections"
 msgstr "Samlingar"
 
@@ -3720,12 +3782,12 @@ msgstr "Klicka för att öppna"
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:305
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:311
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:317
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1068
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1072
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1074
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:458
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:274
 msgid "None"
 msgstr "Inget"
 
@@ -4611,12 +4673,12 @@ msgid "Footer regular expression:"
 msgstr "Reguljärt uttryck för sidfot:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:56
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:76
 msgid "Invalid regular expression"
 msgstr "Ogiltigt reguljärt uttryck"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:77
 msgid "Invalid regular expression: %s"
 msgstr "Ogiltigt reguljärt uttryck: %s"
 
@@ -4834,11 +4896,11 @@ msgstr ""
 "taggar.</p><p>Om du vill veta mer avancerad användning av XPath se <a "
 "href=\"http://calibre-ebook.com/user_manual/xpath.html\">XPath Tutorial< /a>."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:127
 msgid "Cover browser could not be loaded"
 msgstr "Omslagsbläddraren kunde inte laddas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:179
 msgid "Browse by covers"
 msgstr "Bläddra bland omslag"
 
@@ -4897,124 +4959,124 @@ msgstr "taggar för att lägga till"
 msgid "tags to remove"
 msgstr "taggar för att ta bort"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:49
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:135
 msgid "No details available."
 msgstr "Inga detaljer tillgängliga."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:155
 msgid "Device no longer connected."
 msgstr "Enheten är inte längre ansluten."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:270
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:271
 msgid "Get device information"
 msgstr "Hämta enhetsinformation"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:282
 msgid "Get list of books on device"
 msgstr "Hämta en lista över böcker på enheten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:292
 msgid "Get annotations from device"
 msgstr "Hämta anteckningar från enheten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:301
 msgid "Send metadata to device"
 msgstr "Skicka metadata till enhet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:305
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:306
 msgid "Send collections to device"
 msgstr "Skicka samlingar till enhet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:330
 msgid "Upload %d books to device"
 msgstr "Skicka %d böcker till enheten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:345
 msgid "Delete books from device"
 msgstr "Ta bort böcker från enhet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:362
 msgid "Download books from device"
 msgstr "Hämta böcker från enhet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:372
 msgid "View book on device"
 msgstr "Visa böcker på enheten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:408
 msgid "Set default send to device action"
 msgstr "Grundinställning för \"skicka till enhet\""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:413
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:420
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:422
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:425
 msgid "Email to"
 msgstr "E-post till"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:425
 msgid " and delete from library"
 msgstr " och ta bort från biblioteket"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:434
 msgid "Send to main memory"
 msgstr "Skicka till inbyggt minne"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:436
 msgid "Send to storage card A"
 msgstr "Skicka till minneskort A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:437
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:438
 msgid "Send to storage card B"
 msgstr "Skicka till minneskort B"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:442
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:452
 msgid "Main Memory"
 msgstr "Primärminne"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:469
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:470
 msgid "Send and delete from library"
 msgstr "Skicka och ta bort från biblioteket"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:471
 msgid "Send specific format"
 msgstr "Skicka visst format"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:509
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:510
 msgid "Connect to folder"
 msgstr "Anslut till mappen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:516
 msgid "Connect to iTunes"
 msgstr "Anslut till iTunes"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:521
 msgid "Eject device"
 msgstr "Mata ut enhet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:529
 msgid "Fetch annotations (experimental)"
 msgstr "Hämta anteckningar (experimentellt)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:638
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:639
 msgid "Error communicating with device"
 msgstr "Fel vid kommunikation med enheten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:659
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:660
 msgid "Select folder to open as device"
 msgstr "Välj mapp för att öppnas som enhet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:704
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:705
 msgid "Failed"
 msgstr "Misslyckades"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:710
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:711
 msgid "Error talking to device"
 msgstr "Kunde inte kommunicera med enheten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:711
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:712
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -5022,124 +5084,120 @@ msgstr ""
 "Det uppstod ett temporärt fel under kommunikation med enheten. Vänligen "
 "koppla ur och koppla in enheten igen och/eller starta om."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:753
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:754
 msgid "Device: "
 msgstr "Enhet: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:755
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:756
 msgid " detected."
 msgstr " hittades"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:778
-msgid "Connected "
-msgstr "Ansluten "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:846
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr "vald att skickas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:851
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:847
 msgid "Choose format to send to device"
 msgstr "Välj format att skicka till enhet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:860
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:856
 msgid "No device"
 msgstr "Ingen enhet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:857
 msgid "Cannot send: No device is connected"
 msgstr "Kan inte skicka: ingen enhet är ansluten"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:860
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:868
 msgid "No card"
 msgstr "Inget kort"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:869
 msgid "Cannot send: Device has no storage card"
 msgstr "Kan inte skicka: Enheten har inget minneskort"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:910
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:906
 msgid "E-book:"
 msgstr "E-bok:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:913
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:909
 msgid "Attached, you will find the e-book"
 msgstr "Bifogat, kommer du hitta e-boken"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:910
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:181
 msgid "by"
 msgstr "av"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:915
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:911
 msgid "in the %s format."
 msgstr "i %s-formatet."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:928
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:924
 msgid "Sending email to"
 msgstr "Skickar e-post till"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:958
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:965
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1057
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1118
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1236
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:954
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:962
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1054
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1235
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:1243
 msgid "No suitable formats"
 msgstr "Inga lämpliga format"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:959
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:955
 msgid "Auto convert the following books before sending via email?"
 msgstr "Skall böckerna konverteras automatiskt innan de skickas med e-post?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:966
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:963
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 "Kunde inte skicka följande böcker eftersom inget lämpligt format hittades:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:984
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:981
 msgid "Failed to email books"
 msgstr "Kunde inte skicka böcker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:985
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:982
 msgid "Failed to email the following books:"
 msgstr "Kunde inte skicka följande böcker:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:989
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:986
 msgid "Sent by email:"
 msgstr "Skickat via e-post:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1016
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1013
 msgid "News:"
 msgstr "Nyheter:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1017
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1014
 msgid "Attached is the"
 msgstr "Bifogat är"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1028
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1025
 msgid "Sent news to"
 msgstr "Skickat nyheter till"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1058
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1237
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1055
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1117
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1236
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 "Skall följande böcker konverteras automatiskt innan de skickas till enheten?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1087
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1085
 msgid "Sending catalogs to device."
 msgstr "Skickar kataloger till enhet."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1150
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1149
 msgid "Sending news to device."
 msgstr "Skickar nyheter till enheten."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1202
 msgid "Sending books to device."
 msgstr "Skickar böcker till enheten."
 
@@ -5195,7 +5253,7 @@ msgid "My Books"
 msgstr "Mina böcker"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:69
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:289
 msgid "Generate catalog"
 msgstr "Generera katalog"
 
@@ -5338,11 +5396,11 @@ msgstr "Bred"
 msgid "Narrow"
 msgstr "Smal"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:503
 msgid "System port selected"
 msgstr "Systemport vald"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:503
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:504
 msgid ""
 "The value <b>%d</b> you have chosen for the content server port is a system "
 "port. Your operating system <b>may</b> not allow the server to run on this "
@@ -5352,131 +5410,131 @@ msgstr ""
 "operativsystem kanske inte tillåter att servern lyssnar på denna port. För "
 "att vara på den säkra sidan, välj ett portnummer över 1024."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:524
 msgid "Failed to install command line tools."
 msgstr "Kunde inte installera kommandoradsverktygen."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:527
 msgid "Command line tools installed"
 msgstr "Kommandoradsverktygen har installerats"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:528
 msgid "Command line tools installed in"
 msgstr "Kommandoradsverktygen har installerats i"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:529
 msgid ""
 "If you move calibre.app, you have to re-install the command line tools."
 msgstr ""
 "Om du flyttar calibre.app måste du installera om kommandoradsverktygen."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:580
 msgid "No valid plugin path"
 msgstr "Ingen giltig sökväg till tillägg"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:581
 msgid "%s is not a valid plugin path"
 msgstr "%s är inte en giltig sökväg till ett tillägg"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:584
 msgid "Choose plugin"
 msgstr "Välj tillägg"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:596
 msgid "Plugin cannot be disabled"
 msgstr "Tillägget kan inte inaktiveras"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:597
 msgid "The plugin: %s cannot be disabled"
 msgstr "Tillägget: %s kan inte inaktiveras"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:606
 msgid "Plugin not customizable"
 msgstr "Tillägget går inte att anpassa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:607
 msgid "Plugin: %s does not need customization"
 msgstr "Tillägget: %s behöver inte anpassas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:615
 msgid "Customize"
 msgstr "Anpassa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:652
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:653
 msgid "Cannot remove builtin plugin"
 msgstr "Kan inte ta bort inbyggt tillägg"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:653
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:654
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 " kan inte tas bort. Det är ett inbyggt tillägg. Försök att inaktivera det i "
 "stället."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:684
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:685
 msgid "You must select a column to delete it"
 msgstr "Du måste välja en kolumn för att radera det"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:690
 msgid "The selected column is not a custom column"
 msgstr "Den valda kolumnen är inte en egen kolumn"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:690
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:691
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
 msgid "Are you sure?"
 msgstr "Är du säker?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:691
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:692
 msgid "Do you really want to delete column %s and all its data?"
 msgstr "Vill du verkligen ta bort kolumn %s och alla dess data?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:758
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:759
 msgid "Error log:"
 msgstr "Fellogg:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:765
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:766
 msgid "Access log:"
 msgstr "Åtkomstlogg:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:793
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:794
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:331
 msgid "Failed to start content server"
 msgstr "Kunde inte starta medieservern"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:817
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:818
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:587
 msgid "Select location for books"
 msgstr "Välj plats för böcker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:824
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:825
 msgid "Invalid size"
 msgstr "Ogiltig storlek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:825
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:826
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr "Storleken %s är ogiltig. Den måste anges som breddxhöjd"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:884
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:889
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:891
 msgid "Invalid database location"
 msgstr "Ogiltig plats för databas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:885
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:887
 msgid "Invalid database location "
 msgstr "Ogiltig plats för databas "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:888
 msgid "<br>Must be a directory."
 msgstr "<br>Måste vara en katalog."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:890
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:892
 msgid "Invalid database location.<br>Cannot write to "
 msgstr "Ogiltig plats för databas. <br>Kan inte skriva till "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:895
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:897
 msgid "Must restart"
 msgstr "Måste starta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:896
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:898
 msgid ""
 "The changes you made require that Calibre be restarted. Please restart as "
 "soon as practical."
@@ -5484,19 +5542,19 @@ msgstr ""
 "De ändringar du gjort kräver att calibre att startas om. Vänligen starta om "
 "så snart det är praktiskt möjligt."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:930
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:932
 msgid "Checking database integrity"
 msgstr "Kontrollerar databasintegritet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:950
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:952
 msgid "Failed to check database integrity"
 msgstr "Kunde inte kontrollera databasintegritet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:957
 msgid "Some inconsistencies found"
 msgstr "Några inkonsekvenser hittades"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:956
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:958
 msgid ""
 "The following books had formats listed in the database that are not actually "
 "available. The entries for the formats have been removed. You should check "
@@ -5508,11 +5566,11 @@ msgstr ""
 "dem manuellt. Detta kan inträffa om du ändrar på filerna direkt i "
 "biblioteksmappen."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:133
 msgid "TabWidget"
 msgstr "TabWidget"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:134
 msgid ""
 "Here you can control how calibre will read metadata from the files you add "
 "to it. calibre can either read metadata from the contents of the file, or "
@@ -5522,11 +5580,11 @@ msgstr ""
 "i biblioteket. Calibre kan antingen läsa metadata från innehållet i filen "
 "eller från filnamnet."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:135
 msgid "Read metadata only from &file name"
 msgstr "Läs metadata endast från &filnamnet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:136
 msgid ""
 "Swap the firstname and lastname of the author. This affects only metadata "
 "read from file names."
@@ -5534,11 +5592,11 @@ msgstr ""
 "Byt plats på författarens förnamn och efternamn. Detta påverkar endast "
 "metadata som lästs från filnamnen."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:137
 msgid "&Swap author firstname and lastname"
 msgstr "Byt plats på författarens förnamn och efternamn"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:138
 msgid ""
 "If an existing book with a similar title and author is found that does not "
 "have the format being added, the format is added\n"
@@ -5555,7 +5613,7 @@ msgstr ""
 "Titelmatchning bortser från indefinita artiklar (den/det, en/ett), "
 "skiljetecken, skiftläget, osv. Författaren matchas exakt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:142
 msgid ""
 "If books with similar titles and authors found, &merge the new files "
 "automatically"
@@ -5563,15 +5621,15 @@ msgstr ""
 "Sammanfoga poster automatiskt om böcker med liknande författare och titel "
 "hittas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:143
 msgid "&Configure metadata from file name"
 msgstr "Konfigurera metadata från filnamn"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:144
 msgid "&Adding books"
 msgstr "Lägg till böcker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:145
 msgid ""
 "Here you can control how calibre will save your books when you click the "
 "Save to Disk button:"
@@ -5579,65 +5637,77 @@ msgstr ""
 "Här kan du kontrollera hur Calibre sparar dina böcker när du klickar på "
 "knappen Spara till disk:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:146
 msgid "Save &cover separately"
 msgstr "Spara omslag separat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:147
 msgid "Update &metadata in saved copies"
 msgstr "Uppdatera &metadata i sparade kopior"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:148
 msgid "Save metadata in &OPF file"
 msgstr "Spara metadata i &OPF-fil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:149
 msgid "Convert non-English characters to &English equivalents"
 msgstr "Konvertera icke-engelska tecken till &engelska motsvarigheter"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:150
 msgid "Format &dates as:"
 msgstr "Formatera &datum som:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:151
 msgid "File &formats to save:"
 msgstr "Fil&format att spara som:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:152
 msgid "Replace space with &underscores"
 msgstr "Ersätt mellanslag med understreck"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:153
 msgid "Change paths to &lowercase"
 msgstr "Ändra sökväg till gemener"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:154
 msgid "&Saving books"
 msgstr "&Spara böcker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:135
-msgid "Preserve device collections."
-msgstr "Bevara samlingar på enheten"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:155
+msgid "Metadata &management:"
+msgstr "Hantera metadata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:156
+msgid "Manual management"
+msgstr "Hantea manuellt"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:157
+msgid "Only on send"
+msgstr "Endast när filen skickas"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:158
+msgid "Automatic management"
+msgstr "Hantera automatiskt"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:159
 msgid ""
-"If checked, collections will not be deleted even if a book with changed "
-"metadata is resent and the collection is not in the book's metadata. In "
-"addition, editing collections in the device view will be enabled. If "
-"unchecked, collections will be always reflect only the metadata in the "
-"calibre library."
+"<li><b>Manual Management</b>: Calibre updates the metadata and adds "
+"collections only when a book is sent. With this option, calibre will never "
+"remove a collection.</li>\n"
+"<li><b>Only on send</b>: Calibre updates metadata and adds/removes "
+"collections for a book only when it is sent to the device. </li>\n"
+"<li><b>Automatic management</b>: Calibre automatically keeps metadata on the "
+"device in sync with the calibre library, on every connect</li></ul>"
 msgstr ""
-"Om detta alternativ väljs, kommer samlingar inte att tas bort även om en bok "
-"med ändrade metadata skickas igen och samlingen inte finns i bokens "
-"metadata. Dessutom blir det möjligt att redigera samlingar i enhetsvyn. Om "
-"alternativet inte väljs, kommer samlingar bara att reflektera metadata i "
-"Calibrebiblioteket."
+"<li><b>Manuell hantering</b>: Calibre uppdaterar metadata och lägger till "
+"samlingar endast när boken sänds. Med detta alternativ kommer Calibre aldrig "
+"att ta bort någon samling.</li>\n"
+"<li><b>Endast när filen skickas</b>: Calibre uppdaterar metadata och lägger "
+"till eller tar bort samling endast när boken skickas till enheten. </li>\n"
+"<li><b>Automatic management</b>: Calibre synkroniserar automatiskt metadata "
+"på enheten varje gång den ansluts</li></ul>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:137
-msgid "  "
-msgstr "  "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:162
 msgid ""
 "Here you can control how calibre will save your books when you click the "
 "Send to Device button. This setting can be overriden for individual devices "
@@ -5648,18 +5718,19 @@ msgstr ""
 "individuella enheter genom att anpassa enhetens gränssnittstillägg i "
 "Inställningar-> Tillägg"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:163
 msgid "Sending to &device"
 msgstr "Skicka till enhet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:167
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:174
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr "Inställningar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
@@ -5667,27 +5738,27 @@ msgstr ""
 "E-böckernas plats (E-böckerna lagras i mappar sorterade efter författare, "
 "och metadata lagras i filen metadata.db)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
 msgid "Browse for the new database location"
 msgstr "Bläddra till den nya databasens plats"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
 msgid "Show notification when &new version is available"
 msgstr "Visa ett meddelande när en &ny version finns tillgänglig"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
 msgid "Download &social metadata (tags/ratings/etc.) by default"
 msgstr "Ladda ner &sociala metadata (etiketter/omdömen/etc.) som standard"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
 msgid "&Overwrite author and title by default when fetching metadata"
 msgstr "&Skriv över författare och titel när metadata hämtas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
 msgid "Default network &timeout:"
 msgstr "Vänta på nätverkssvar i max"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
@@ -5695,153 +5766,157 @@ msgstr ""
 "Ange hur länge programmet ska vänta på information från nätverket (d.v.s. "
 "när information hämtas från Internet)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
 msgid " seconds"
 msgstr " sekunder"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
 msgid "Choose &language (requires restart):"
 msgstr "Välj språk (kräver omstart):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
 msgid "Normal"
 msgstr "Normal"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
 msgid "High"
 msgstr "Hög"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
 msgid "Low"
 msgstr "Låg"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
 msgid "Job &priority:"
 msgstr "Jobb&prioritet:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
 msgid "Preferred &output format:"
 msgstr "Önskat &utformat:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
 msgid "Preferred &input format order:"
 msgstr "Önskade &informat i ordning:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
 msgid "Use &Roman numerals for series number"
 msgstr "Använd &romerska siffror för bokens nummer i serien"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
 msgid "Enable system &tray icon (needs restart)"
 msgstr "Visa ikon i systemfältet (kräver omstart)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
 msgid "Show &notifications in system tray"
 msgstr "&Visa meddelanden i systemfältet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
 msgid "Show &splash screen at startup"
 msgstr "Visa uppstartsfönster"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr "Visa omslags&bläddrare i ett separat fönster (kräver omstart)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
 msgid "Show &average ratings in the tags browser"
 msgstr "Visa medelbetyg i etikettbläddraren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
 msgid "Search as you type"
 msgstr "Sök &medan du skriver"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr "Skicka automatiskt hämtade nyheter till läsplattan"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
 msgid "&Delete news from library when it is automatically sent to reader"
 msgstr ""
 "Ra&dera automatiskt nyheter från biblioteket när de skickats till läsplattan"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr "A&ntal omslag att visa i bläddringsläget (kräver omstart):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
 msgid "Toolbar"
 msgstr "Verktygsrad"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
 msgid "Large"
 msgstr "Stor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
 msgid "Medium"
 msgstr "Medel"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
 msgid "Small"
 msgstr "Liten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
 msgid "&Button size in toolbar"
 msgstr "&Bildknappstorlek i verktygsfältet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
 msgid "Show &text in toolbar buttons"
 msgstr "Visa &text på bildknappar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
 msgid "Select visible &columns in library view"
 msgstr "Välj synliga &kolumnerna i biblioteketsvyn"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
 msgid "Remove a user-defined column"
 msgstr "Ta bort ett användardefinierat kolumnen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
 msgid "Add a user-defined column"
 msgstr "Lägg till en användardefinierat kolumn"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
 msgid "Edit settings of a user-defined column"
 msgstr "Redigera inställningar för en användardefinierad kolumn"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
 msgid "Use internal &viewer for:"
 msgstr "Använda interna läsare för:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
 msgid "User Interface &layout (needs restart):"
 msgstr "Vy (omstart krävs)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 "Inaktivera alla animationer. Används om du har en långsam/gammal dator."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
 msgid "Disable &animations"
 msgstr "Inaktivera animationer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
+msgid "Show &donate button (restart)"
+msgstr "Visa &donationsknapp"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
 msgid "Add an email address to which to send books"
 msgstr "Lägg till en e-postadress som du vill skicka böcker till"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
 msgid "&Add email"
 msgstr "Lägg till e-post"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
 msgid "Make &default"
 msgstr "Ange som grundinställning"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
 msgid "&Remove email"
 msgstr "Ta bort e-post"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
 msgid ""
 "calibre can send your books to you (or your reader) by email. Emails will be "
 "automatically sent for downloaded news to all email addresses that have Auto-"
@@ -5850,32 +5925,32 @@ msgstr ""
 "Caliber kan skicka böckerna till dig (eller dina läsare) via e-post. Hämtade "
 "nyheter skickas automatiskt till alla e-postadresser som har markerats."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
 msgid "&Maximum number of waiting worker processes (needs restart):"
 msgstr "&Maximalt antal väntande processer (kräver omstart):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
 msgid "&Check database integrity"
 msgstr "&Kontrollera databasintegritet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
 msgid "&Install command line tools"
 msgstr "&Installera kommandoradsverktyg"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
 msgid "Open calibre &configuration directory"
 msgstr "Öppna &Calibres inställningsmapp"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
 msgid "Limit the max. simultaneous jobs to the available CPU &cores"
 msgstr ""
 "Begränsa maximalt antal samtidiga jobb till de tillgängliga &CPU-kärnorna"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
 msgid "Debug &device detection"
 msgstr "Felsök enhets&detektion"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
 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 "
@@ -5885,25 +5960,25 @@ msgstr ""
 "var som helst i världen med hjälp av en webbläsare. Eventuella ändringar i "
 "inställningarna träder i kraft först efter en serveromstart."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
 msgid "Server &port:"
 msgstr "Server&port:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:212
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:117
 msgid "&Username:"
 msgstr "Användarnamn:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:213
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:119
 msgid "&Password:"
 msgstr "Lösenord:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
@@ -5911,7 +5986,7 @@ msgstr ""
 "Om du lämnar lösenordet tomt, kan vem som helst komma åt ditt bibliotek via "
 "webbgränssnittet."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
@@ -5919,45 +5994,45 @@ msgstr ""
 "Den maximala storleken (breddxhöjd) som omslag får visas i. Större omslag "
 "skalas ned. "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
 msgid "Max. &cover size:"
 msgstr "Största omslagsstorlek:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:621
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:214
 msgid "&Show password"
 msgstr "Vi&sa lösenord"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
 msgid "Max. &OPDS items per query:"
 msgstr "Max. &OPDS-poster per fråga:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
 msgid "Max. OPDS &ungrouped items:"
 msgstr "Max. antal ogr&upperade OPDS-poster"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
 msgid "&Start Server"
 msgstr "&Starta servern"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:621
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
 msgid "St&op Server"
 msgstr "St&oppa servern"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:626
 msgid "&Test Server"
 msgstr "&Testa servern"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
 msgid "Run server &automatically on startup"
 msgstr "Starta servern automatiskt när Calibre startas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:628
 msgid "View &server logs"
 msgstr "Visa &serverloggar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:46
 msgid ""
 "<p>Remember to leave calibre running as the server only runs as long as "
@@ -5974,7 +6049,7 @@ msgstr ""
 "läsaren på din iPhone. Myhostname bör vara det fullständiga värdnamnet eller "
 "IP-adressen till datorn Calibre körs på."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:631
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
@@ -5982,27 +6057,27 @@ msgstr ""
 "Här kan du anpassa Calibres beteende genom att kontrollera vilka tillägg som "
 "används."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:628
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:632
 msgid "Enable/&Disable plugin"
 msgstr "Aktivera/Inaktivera tillägg"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:633
 msgid "&Customize plugin"
 msgstr "Anpassa tillägg"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:630
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:634
 msgid "&Remove plugin"
 msgstr "Ta bort tillägg"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:635
 msgid "Add new plugin"
 msgstr "Installera tillägg"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:632
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:636
 msgid "Plugin &file:"
 msgstr "Tilläggs&fil:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:634
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:638
 msgid "&Add"
 msgstr "Lägg till"
 
@@ -6040,9 +6115,9 @@ msgstr "Tal"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:31
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:884
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:889
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Date"
 msgstr "Datum"
@@ -6249,12 +6324,20 @@ msgstr "Visa denna varning igen"
 msgid "ERROR"
 msgstr "FEL"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:67
+msgid ""
+"All checked books will be <b>permanently deleted</b> from your device. "
+"Please verify the list."
+msgstr ""
+"Alla markerade böcker kommer att <b>tas bort permanent</b> från din enhet. "
+"Kontrollera listan."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 msgid "Location"
 msgstr "Plats"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1058
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1064
 msgid "Format"
 msgstr "Format"
 
@@ -7091,6 +7174,10 @@ msgid "Add tag to available tags and apply it to current book"
 msgstr ""
 "Lägg till etiketten i tillgängliga etiketter och tillämpa den på aktuell bok"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:20
+msgid "%s (was %s)"
+msgstr "%s (var %s)"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:501
 msgid "Item is blank"
@@ -7416,11 +7503,11 @@ msgstr "Reguljärt uttryck (?P&lt;title&gt;)"
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:88
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:93
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:98
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:100
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:99
 msgid "No match"
 msgstr "Ingen träff"
 
@@ -7460,43 +7547,43 @@ msgstr "Reguljärt uttryck (?P<isbn>)"
 msgid "Save single format to disk..."
 msgstr "Spara ett enstaka format till disk ..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:53
 msgid "Edit metadata individually"
 msgstr "Redigera metadata individuellt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:56
 msgid "Edit metadata in bulk"
 msgstr "Redigera metadata i grupp"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:59
 msgid "Download metadata and covers"
 msgstr "Hämta metadata och omslag"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:62
 msgid "Download only metadata"
 msgstr "Hämta bara metadata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:64
 msgid "Download only covers"
 msgstr "Hämta bara omslag"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:67
 msgid "Download only social metadata"
 msgstr "Hämta bara sociala metadata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:73
 msgid "Merge into first selected book - delete others"
 msgstr "Slå samman till den första valda boken - radera övriga"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:76
 msgid "Merge into first selected book - keep others"
 msgstr "Slå samman till den första valda boken - behåll övriga"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:84
 msgid "Add books from a single directory"
 msgstr "Lägg till böcker från en enda katalog"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:86
 msgid ""
 "Add books from directories, including sub-directories (One book per "
 "directory, assumes every ebook file is the same book in a different format)"
@@ -7504,7 +7591,7 @@ msgstr ""
 "Lägg till böcker från kataloger, inklusive underkataloger (en bok per "
 "katalog, antar att varje e-bokfil är samma bok i ett annat format)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:90
 msgid ""
 "Add books from directories, including sub directories (Multiple books per "
 "directory, assumes every ebook file is a different book)"
@@ -7512,98 +7599,116 @@ msgstr ""
 "Lägg till böcker från kataloger, inklusive underkataloger (flera böcker per "
 "katalog, antar att varje e-bokfil en ny bok)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:93
 msgid "Add Empty book. (Book entry with no formats)"
 msgstr "Lägg till tom bok (bokpost utan format)."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:102
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:160
 msgid "Save to disk"
 msgstr "Spara till disk"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Save to disk in a single directory"
 msgstr "Spara till disk i en enda katalog"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:106
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:402
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:393
 msgid "Save only %s format to disk"
 msgstr "Spara bara %s-format på disk"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:110
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:396
 msgid "Save only %s format to disk in a single directory"
 msgstr "Spara bara %s format till disk i en enda katalog"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:119
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:166
 msgid "View"
 msgstr "Visa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:121
 msgid "View specific format"
 msgstr "Visa specifikt format"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:127
 msgid "Remove selected books"
 msgstr "Ta bort valda böcker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:129
 msgid "Remove files of a specific format from selected books.."
 msgstr "Ta bort filer av specifikt format från valda böcker."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:132
 msgid "Remove all formats from selected books, except..."
 msgstr "Ta bort alla format från utvalda böcker, utom ..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:135
 msgid "Remove covers from selected books"
 msgstr "Ta bort omslag från valda böcker"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:138
 msgid "Remove matching books from device"
 msgstr "Ta bort matchande böcker från enheten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:155
 msgid "Convert individually"
 msgstr "Konvertera individuellt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:157
 msgid "Bulk convert"
 msgstr "Masskonvertering"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:161
 msgid "Create catalog of books in your calibre library"
 msgstr "Skapa en bokkatalog i ditt Calibre biblioteket"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:169
 msgid "Run welcome wizard"
 msgstr "Kör välkomstguide"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:191
 msgid "Similar books..."
 msgstr "Liknande böcker..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:223
 msgid "Add books to library"
 msgstr "Lägg till böcker i biblioteket"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:234
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:241
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:239
 msgid "Manage collections"
 msgstr "Hantera samlingar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:328
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:319
 msgid "Cover Browser"
 msgstr "Omslagsbläddrare"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:337
 msgid "Tag Browser"
 msgstr "Etikettbläddrare"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:358
+msgid "version"
+msgstr "version"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:359
+msgid "created by Kovid Goyal"
+msgstr "skapat av Kovid Goyal"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:377
+msgid "Connected "
+msgstr "Ansluten "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:386
+msgid "Update found"
+msgstr "Uppdatering tillgänglig"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:430
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:439
 msgid "Book Details"
 msgstr "Bokinformation"
 
@@ -7666,6 +7771,230 @@ msgstr "Klicka för att se listan över aktiva jobb."
 msgid " - Jobs"
 msgstr " - Jobb"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:64
+msgid ""
+"Library\n"
+"%d books"
+msgstr ""
+"Bibliotek\n"
+"%d böcker"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:65
+msgid ""
+"Reader\n"
+"%s"
+msgstr ""
+"Läsplatta\n"
+"%s"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:66
+msgid ""
+"Card A\n"
+"%s"
+msgstr ""
+"Minneskort A\n"
+"%s"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:67
+msgid ""
+"Card B\n"
+"%s"
+msgstr ""
+"Minneskort B\n"
+"%s"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:71
+msgid "Click to see the books available on your computer"
+msgstr "Klicka för att se böcker som finns på din dator"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:74
+msgid "Click to see the books in the main memory of your reader"
+msgstr "Klicka för att se böckerna i läsplattans inbyggda minne"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:75
+msgid "Click to see the books on storage card A in your reader"
+msgstr "Klicka för att se böckerna på minneskort A i läsplattan"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:76
+msgid "Click to see the books on storage card B in your reader"
+msgstr "Klicka för att se böckerna på minneskort B i läsplattan"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:84
+msgid "Books located at"
+msgstr "Böcker finns på"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:100
+msgid "free"
+msgstr "ledigt"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:134
+msgid ""
+"Books display will be restricted to those matching the selected saved search"
+msgstr ""
+"Bokskärmen kommer att begränsas till de som passar den valda sparade "
+"sökningen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:136
+msgid "Advanced search"
+msgstr "Avancerad sökning"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:141
+msgid ""
+"<p>Search the list of books by title, author, publisher, tags, comments, "
+"etc.<br><br>Words separated by spaces are ANDed"
+msgstr ""
+"<p>Sök i listan med böcker efter titel, författare, förlag, taggar, "
+"kommentarer, m.m. <br><br>Ord separerade med mellanslag får relationen OCH"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:142
+msgid "Reset Quick Search"
+msgstr "Återställ snabbsökning"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:328
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:144
+msgid "Copy current search text (instead of search name)"
+msgstr "Kopiera aktuell söktext (i stället för söknamn)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:146
+msgid "Save current search under the name shown in the box"
+msgstr "Spara aktuell sökning under namnet som visas i rutan"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:148
+msgid "Delete current saved search"
+msgstr "Radera aktuell sparad sökning"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:150
+msgid "Add books"
+msgstr "Lägg till böcker"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:151
+msgid "A"
+msgstr "A"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:153
+msgid "Remove books"
+msgstr "Ta bort böcker"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:154
+msgid "Del"
+msgstr "Del"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:406
+msgid "Edit meta info"
+msgstr "Redigera metadata"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:406
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:156
+msgid "E"
+msgstr "E"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:157
+msgid "Merge book records"
+msgstr "Sammanfoga bokuppgifter"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:158
+msgid "M"
+msgstr "M"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:159
+msgid "Send to device"
+msgstr "Skicka till enhet"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:161
+msgid "S"
+msgstr "S"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:162
+msgid "Fetch news"
+msgstr "Hämta nyheter"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:163
+msgid "F"
+msgstr "F"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:164
+msgid "Convert books"
+msgstr "Konvertera böcker"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:165
+msgid "C"
+msgstr "C"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:167
+msgid "V"
+msgstr "V"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:168
+msgid "Open containing folder"
+msgstr "Öppna mapp"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:169
+msgid "Show book details"
+msgstr "Visa bokdetaljer"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:170
+msgid "Books by same author"
+msgstr "Böcker med samma författare"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:171
+msgid "Books in this series"
+msgstr "Böcker i denna serie"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:172
+msgid "Books by this publisher"
+msgstr "Böcker av den här utgivaren"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:173
+msgid "Books with the same tags"
+msgstr "Böcker med samma etikett"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:176
+msgid "Ctrl+P"
+msgstr "Ctrl+P"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:177
+msgid "Help"
+msgstr "Hjälp"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:178
+msgid "Browse the calibre User Manual"
+msgstr "Läs Calibres användarhandbok"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:179
+msgid "F1"
+msgstr "F1"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:284
 msgid "N"
 msgstr "N"
@@ -7687,29 +8016,29 @@ msgid "Rating"
 msgstr "Betyg"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:324
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1084
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr "Bok <font face=\"serif\">%s</font> av %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:674
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1176
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1182
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
 msgid "The lookup/search name is \"{0}\""
 msgstr "Söknamn är \"(0)\""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:886
 msgid "In Library"
 msgstr "I biblioteket"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:885
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:890
 msgid "Size"
 msgstr "Storlek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1156
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1162
 msgid "Marked for deletion"
 msgstr "Markerat för borttagning"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1165
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr "Dubbelklicka för att <b>redigera</b> mig<br><br>"
 
@@ -7753,11 +8082,11 @@ msgstr "Visa kolumn"
 msgid "Restore default layout"
 msgstr "Återställ standardutformning"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:524
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:525
 msgid "Not allowed"
 msgstr "Tillåẗs ej"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:526
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
@@ -7960,159 +8289,34 @@ msgstr "försök att starta om datorn."
 msgid "try deleting the file"
 msgstr "försök att ta bort filen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:131
 msgid "calibre"
 msgstr "Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:133
 msgid "&Restrict to:"
 msgstr "&Begränsa till:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
-msgid ""
-"Books display will be restricted to those matching the selected saved search"
-msgstr ""
-"Bokskärmen kommer att begränsas till de som passar den valda sparade "
-"sökningen"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:135
 msgid "set in ui.py"
 msgstr "Ställ in i ui.py"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
-msgid "Advanced search"
-msgstr "Avancerad sökning"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:138
 msgid "Alt+S"
 msgstr "Alt+S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:139
 msgid "&Search:"
 msgstr "&Sök:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
-msgid ""
-"<p>Search the list of books by title, author, publisher, tags, comments, "
-"etc.<br><br>Words separated by spaces are ANDed"
-msgstr ""
-"<p>Sök i listan med böcker efter titel, författare, förlag, taggar, "
-"kommentarer, m.m. <br><br>Ord separerade med mellanslag får relationen OCH"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
-msgid "Reset Quick Search"
-msgstr "Återställ snabbsökning"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
-msgid "Choose saved search or enter name for new saved search"
-msgstr "Välj sparad sökning eller ange namn för en ny sparad sökning"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
-msgid "Copy current search text (instead of search name)"
-msgstr "Kopiera aktuell söktext (i stället för söknamn)"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
-msgid "Save current search under the name shown in the box"
-msgstr "Spara aktuell sökning under namnet som visas i rutan"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
-msgid "Delete current saved search"
-msgstr "Radera aktuell sparad sökning"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
-msgid "Add books"
-msgstr "Lägg till böcker"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
-msgid "A"
-msgstr "A"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
-msgid "Remove books"
-msgstr "Ta bort böcker"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
-msgid "Del"
-msgstr "Del"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:155
 msgid "Edit meta information"
 msgstr "Redigera metainformation"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
-msgid "E"
-msgstr "E"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
-msgid "Merge book records"
-msgstr "Sammanfoga bokuppgifter"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
-msgid "M"
-msgstr "M"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
-msgid "Send to device"
-msgstr "Skicka till enhet"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
-msgid "S"
-msgstr "S"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
-msgid "Fetch news"
-msgstr "Hämta nyheter"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
-msgid "F"
-msgstr "F"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
-msgid "Convert E-books"
-msgstr "Konvertera e-böcker"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
-msgid "C"
-msgstr "C"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
-msgid "V"
-msgstr "V"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
-msgid "Open containing folder"
-msgstr "Öppna mapp"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
-msgid "Show book details"
-msgstr "Visa bokdetaljer"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
-msgid "Books by same author"
-msgstr "Böcker med samma författare"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
-msgid "Books in this series"
-msgstr "Böcker i denna serie"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
-msgid "Books by this publisher"
-msgstr "Böcker av den här utgivaren"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
-msgid "Books with the same tags"
-msgstr "Böcker med samma etikett"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:175
 msgid "Configure calibre"
 msgstr "Anpassa Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
-msgid "Ctrl+P"
-msgstr "Ctrl+P"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:20
 msgid ""
 "Redirect console output to a dialog window (both stdout and stderr). Useful "
@@ -8141,33 +8345,42 @@ msgstr "Boken har varken titel eller ISBN"
 msgid "No matches found for this book"
 msgstr "Inga träffar hittades för den här boken"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:91
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:553
 msgid "Search"
 msgstr "Sök"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:313
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:315
 msgid "The selected search will be <b>permanently deleted</b>. Are you sure?"
 msgstr ""
 "Den valda sökningen kommer att <b> tas bort permanent </b>. Är du säker?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:357
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr "Sök (för avancerad sökning, klicka på knappen till vänster)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:392
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:398
 msgid "Saved Searches"
 msgstr "Sparade sökningar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:406
+msgid "Choose saved search or enter name for new saved search"
+msgstr "Välj sparad sökning eller ange namn för en ny sparad sökning"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:10
+msgid "Restrict to"
+msgstr "Begränsa till"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:48
 msgid "({0} of {1})"
 msgstr "({0} av {1})"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
 msgid "(all books)"
 msgstr "(alla böcker)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:56
 msgid "({0} of all)"
 msgstr "({0} av alla)"
 
@@ -8290,18 +8503,31 @@ msgstr "Sortera efter popularitet"
 msgid "Sort by average rating"
 msgstr "Sortera efter medelbetyg"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:775
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:772
+msgid "Set the sort order for entries in the Tag Browser"
+msgstr "Ange sorteringsordning i etikettbläddraren"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:778
 msgid "Match all"
 msgstr "Matcha alla"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:775
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:778
 msgid "Match any"
 msgstr "Matcha någon"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:783
+msgid ""
+"When selecting multiple entries in the Tag Browser match any or all of them"
+msgstr "Matcha någon eller alla träffar i etikettbläddraren"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:787
 msgid "Manage &user categories"
 msgstr "Hantera &användarkategorier"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:790
+msgid "Add your own categories to the Tag Browser"
+msgstr "Lägg till egna kategorier i etikettbläddraren"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182
 msgid "Convert book %d of %d (%s)"
@@ -8329,15 +8555,15 @@ msgstr "Köar böcker för masskonvertering"
 msgid "Queueing "
 msgstr "Köar "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:239
 msgid "Fetch news from "
 msgstr "Hämta nyheter från "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:301
 msgid "Convert existing"
 msgstr "Konvertering finns"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:302
 msgid ""
 "The following books have already been converted to %s format. Do you wish to "
 "reconvert them?"
@@ -8353,55 +8579,46 @@ msgstr "Åte&rställ"
 msgid "&Donate to support calibre"
 msgstr "&Donera för att stödja Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:168
 msgid "&Eject connected device"
 msgstr "Mata ut ansluten &enhet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:173
 msgid "&Restart"
 msgstr "Omsta&rt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:206
-msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
-msgstr "<p>För hjälp se: <a href=\"%s\">Användarhandbok</a><br>"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:212
-msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
-msgstr ""
-"<b>%s</b>: %s av <b> Kovid Goyal %%(version)s </b><br>%%(device)s</p>"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:227
 msgid "Calibre Quick Start Guide"
 msgstr "Calibres snabbstartsguide"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:389
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:380
 msgid "Cannot configure"
 msgstr "Kan inte konfigurera"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:376
 msgid "Cannot configure while there are running jobs."
 msgstr "Kan inte konfigurera när det finns jobb som körs"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:381
 msgid "Cannot configure before calibre is restarted."
 msgstr "Kan inte konfigurera innan calibre startas om."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:424
 msgid "No detailed info available"
 msgstr "Ingen detaljinformation tillgänglig"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:425
 msgid "No detailed information is available for books on the device."
 msgstr ""
 "Ingen detaljerad information finns tillgänglig för böcker på enheten."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:486
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr "Konverteringen misslyckades"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:487
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:478
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using third party tools."
@@ -8409,27 +8626,29 @@ msgstr ""
 "<p>Kunde inte konvertera: %s <p>Det är en <a href=\"%s\">DRM-</a>skyddad "
 "bok. Du måste först ta bort DRM-skyddet med hjälp av tredjepartsverktyg."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:491
 msgid "Recipe Disabled"
 msgstr "Recept inaktiverat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:506
 msgid "<b>Failed</b>"
 msgstr "<b>Misslyckades</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:546
 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."
+"you find it useful, please consider donating to support its development. "
+"Your donation helps keep calibre development going."
 msgstr ""
-"är resultatet av insatserna från många frivilliga över hela världen. Om du "
-"gillar det, överväg att skänka en slant för att stödja dess utveckling."
+"har tagits fram av många frivilliga över hela världen. Om du gillar det kan "
+"du donera för att stödja utvecklingen. Tack vare din donation kan Calibre "
+"fortsätta utvecklas."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:572
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr "Det finns aktiva jobb. Är du säker på att du vill avsluta?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:575
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
@@ -8439,11 +8658,11 @@ msgstr ""
 "                      Om du avslutar nu kan enheten skadas. <br>\n"
 "                      Är du säker på att du vill avsluta ändå?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:579
 msgid "WARNING: Active jobs"
 msgstr "VARNING: Aktiva jobb"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:640
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:632
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -8451,19 +8670,11 @@ msgstr ""
 "fortsätter att köra i systemfältet. För att stänga det, välj <b>Avsluta</b> "
 "i snabbmenyn i systemfältet."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/update.py:52
-msgid ""
-"<span style=\"color:red; font-weight:bold\">Latest version: <a "
-"href=\"%s\">%s</a></span>"
-msgstr ""
-"<span style=\"color:red; font-weight:bold\">Senaste version: <a "
-"href=\"%s\">%s</a></span>"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/update.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:56
 msgid "Update available"
 msgstr "Ny version tillgänglig"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/update.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:57
 msgid ""
 "%s has been updated to version %s. See the <a href=\"http://calibre-"
 "ebook.com/whats-new\">new features</a>. Visit the download page?"
@@ -8944,103 +9155,43 @@ msgstr "Shift+F3"
 msgid "Print eBook"
 msgstr "Skriv ut e-bok"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
 msgid "Copy Image"
 msgstr "Kopiera bild"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:240
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:239
 msgid "Paste Image"
 msgstr "Klista in bild"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:270
-msgid ""
-"Library\n"
-"%d\n"
-"books"
-msgstr ""
-"Bibliotek\n"
-"%d\n"
-"böcker"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:271
-msgid ""
-"Reader\n"
-"%s\n"
-"available"
-msgstr ""
-"Läsplatta\n"
-"%s\n"
-"tillgängligt"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:272
-msgid ""
-"Card A\n"
-"%s\n"
-"available"
-msgstr ""
-"Minneskort A\n"
-"%s\n"
-"tillgängligt"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:273
-msgid ""
-"Card B\n"
-"%s\n"
-"available"
-msgstr ""
-"Minneskort B\n"
-"%s\n"
-"tillgängligt"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:277
-msgid "Click to see the books available on your computer"
-msgstr "Klicka för att se böcker som finns på din dator"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:280
-msgid "Click to see the books in the main memory of your reader"
-msgstr "Klicka för att se böckerna i läsplattans inbyggda minne"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:281
-msgid "Click to see the books on storage card A in your reader"
-msgstr "Klicka för att se böckerna på minneskort A i läsplattan"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:282
-msgid "Click to see the books on storage card B in your reader"
-msgstr "Klicka för att se böckerna på minneskort B i läsplattan"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:290
-msgid "Books located at"
-msgstr "Böcker finns på"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:364
 msgid "Change Case"
 msgstr "Ändra skiftläge"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:365
 msgid "Upper Case"
 msgstr "Versaler"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:366
 msgid "Lower Case"
 msgstr "Gemener"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:367
 msgid "Swap Case"
 msgstr "Byt skiftläge"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:368
 msgid "Title Case"
 msgstr "Varje Ord Med Stor Begynnelsebokstav"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:974
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:837
 msgid "Drag to resize"
 msgstr "Drag för att ändra storlek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:869
 msgid "Show"
 msgstr "Visa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1012
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:876
 msgid "Hide"
 msgstr "Dölj"
 
@@ -10392,8 +10543,8 @@ msgid "User-created tag browser categories"
 msgstr "Användarskapade tagkategoriläsare"
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:702
-msgid "Preserve all collections even if not in library metadata."
-msgstr "Bevara samlingar även om det inte finns i bibliotekets metadata"
+msgid "How and when calibre updates metadata on the device."
+msgstr "Hur och när Calibre uppdaterar metadata på enheten."
 
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:43
 msgid "Waiting..."
@@ -10566,83 +10717,83 @@ msgstr "Okänd nyhetskälla"
 msgid "The \"%s\" recipe needs a username and password."
 msgstr "\"%s\"-receptet behöver ett användarnamn och lösenord."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:706
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:708
 msgid "Download finished"
 msgstr "Hämtningen är färdig"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:708
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:710
 msgid "Failed to download the following articles:"
 msgstr "Kunde inte hämta följande artiklar:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:714
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:716
 msgid "Failed to download parts of the following articles:"
 msgstr "Kunde inte hämta delar av följande artiklar:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:716
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:718
 msgid " from "
 msgstr " från "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:718
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:720
 msgid "\tFailed links:"
 msgstr "\tMisslyckade länkar:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:807
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:809
 msgid "Could not fetch article. Run with -vv to see the reason"
 msgstr "Kunde inte hämta artikel. Kör med -vv för att se orsaken"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:828
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:830
 msgid "Fetching feeds..."
 msgstr "Hämtar flöden..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:833
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:835
 msgid "Got feeds from index page"
 msgstr "Mottagit flöden från indexsidan"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:839
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:841
 msgid "Trying to download cover..."
 msgstr "Försöker hämta omslaget ..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:841
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Generating masthead..."
 msgstr "Skapar redaktionsruta..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:922
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:924
 msgid "Starting download [%d thread(s)]..."
 msgstr "Påbörjar hämtning [%d tråd(ar)]..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:938
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:940
 msgid "Feeds downloaded to %s"
 msgstr "Flöden hämtade till %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:948
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:950
 msgid "Could not download cover: %s"
 msgstr "Kunde inte hämta omslag: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:960
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
 msgid "Downloading cover from %s"
 msgstr "Hämtar omslag från %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1002
 msgid "Masthead image downloaded"
 msgstr "Redaktionslogga hämtad"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1190
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1192
 msgid "Untitled Article"
 msgstr "Namnlös artikel"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1261
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1263
 msgid "Article downloaded: %s"
 msgstr "Artikel hämtad: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1272
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1274
 msgid "Article download failed: %s"
 msgstr "Artikeln kunde inte hämtas: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1289
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1291
 msgid "Fetching feed"
 msgstr "Hämtar flöde"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1436
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1438
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
@@ -10650,7 +10801,7 @@ msgstr ""
 "Kunde inte logga in, kontrollera ditt användarnamn och lösenord för Calibres "
 "prenumerationstjänst."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1452
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1454
 msgid ""
 "You do not have permission to download this issue. Either your subscription "
 "has expired or you have exceeded the maximum allowed downloads for today."
@@ -10835,6 +10986,15 @@ msgstr "Hämta inte CSS-stilmallar."
 #~ msgid "Ebook Viewer"
 #~ msgstr "E-bokläsare"
 
+#~ msgid ""
+#~ "Library\n"
+#~ "%d\n"
+#~ "books"
+#~ msgstr ""
+#~ "Bibliotek\n"
+#~ "%d\n"
+#~ "böcker"
+
 #~ msgid "The author sort string"
 #~ msgstr "Författaresorterasträngen"
 
@@ -10868,6 +11028,13 @@ msgstr "Hämta inte CSS-stilmallar."
 #~ "Grundinställning: \"%default\"\n"
 #~ "Gäller: CSV, XML utformat"
 
+#~ msgid ""
+#~ "<span style=\"color:red; font-weight:bold\">Latest version: <a "
+#~ "href=\"%s\">%s</a></span>"
+#~ msgstr ""
+#~ "<span style=\"color:red; font-weight:bold\">Senaste version: <a "
+#~ "href=\"%s\">%s</a></span>"
+
 #~ msgid "E-book Options"
 #~ msgstr "E-book alternativ"
 
@@ -10935,6 +11102,23 @@ msgstr "Hämta inte CSS-stilmallar."
 #~ msgid "Sort by &popularity"
 #~ msgstr "Sortera efter &popularitet"
 
+#~ msgid "Convert E-books"
+#~ msgstr "Konvertera e-böcker"
+
+#~ msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
+#~ msgstr "<p>För hjälp se: <a href=\"%s\">Användarhandbok</a><br>"
+
+#~ msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
+#~ msgstr ""
+#~ "<b>%s</b>: %s av <b> Kovid Goyal %%(version)s </b><br>%%(device)s</p>"
+
+#~ 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 ""
+#~ "är resultatet av insatserna från många frivilliga över hela världen. Om du "
+#~ "gillar det, överväg att skänka en slant för att stödja dess utveckling."
+
 #~ msgid "Item already used"
 #~ msgstr "Posten används redan."
 
@@ -10947,5 +11131,54 @@ msgstr "Hämta inte CSS-stilmallar."
 #~ msgid "Manage "
 #~ msgstr "Hantera "
 
+#~ msgid ""
+#~ "Card A\n"
+#~ "%s\n"
+#~ "available"
+#~ msgstr ""
+#~ "Minneskort A\n"
+#~ "%s\n"
+#~ "tillgängligt"
+
+#~ msgid ""
+#~ "Card B\n"
+#~ "%s\n"
+#~ "available"
+#~ msgstr ""
+#~ "Minneskort B\n"
+#~ "%s\n"
+#~ "tillgängligt"
+
+#~ msgid ""
+#~ "Reader\n"
+#~ "%s\n"
+#~ "available"
+#~ msgstr ""
+#~ "Läsplatta\n"
+#~ "%s\n"
+#~ "tillgängligt"
+
 #~ msgid "Connect to iTunes (EXPERIMENTAL)"
 #~ msgstr "Anslut till iTunes (experimentellt)"
+
+#~ msgid "Preserve device collections."
+#~ msgstr "Bevara samlingar på enheten"
+
+#~ msgid ""
+#~ "If checked, collections will not be deleted even if a book with changed "
+#~ "metadata is resent and the collection is not in the book's metadata. In "
+#~ "addition, editing collections in the device view will be enabled. If "
+#~ "unchecked, collections will be always reflect only the metadata in the "
+#~ "calibre library."
+#~ msgstr ""
+#~ "Om detta alternativ väljs, kommer samlingar inte att tas bort även om en bok "
+#~ "med ändrade metadata skickas igen och samlingen inte finns i bokens "
+#~ "metadata. Dessutom blir det möjligt att redigera samlingar i enhetsvyn. Om "
+#~ "alternativet inte väljs, kommer samlingar bara att reflektera metadata i "
+#~ "Calibrebiblioteket."
+
+#~ msgid "  "
+#~ msgstr "  "
+
+#~ msgid "Preserve all collections even if not in library metadata."
+#~ msgstr "Bevara samlingar även om det inte finns i bibliotekets metadata"
diff --git a/src/calibre/translations/tr.po b/src/calibre/translations/tr.po
index 94c885082f..65a8cd12b7 100644
--- a/src/calibre/translations/tr.po
+++ b/src/calibre/translations/tr.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-07-03 01:21+0000\n"
-"PO-Revision-Date: 2010-07-02 18:09+0000\n"
+"POT-Creation-Date: 2010-07-09 22:00+0000\n"
+"PO-Revision-Date: 2010-07-09 20:18+0000\n"
 "Last-Translator: Angel Spy <melissadilara@yahoo.com>\n"
 "Language-Team: Turkish <tr@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: 2010-07-03 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-07-10 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
@@ -27,10 +27,10 @@ msgstr "Hiçbir şey yapmaz"
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:71
 #: /home/kovid/work/calibre/src/calibre/devices/prs500/books.py:267
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:466
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:492
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:396
-#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:98
-#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:101
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:97
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:100
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/metadata.py:56
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:428
 #: /home/kovid/work/calibre/src/calibre/ebooks/fb2/input.py:67
@@ -72,9 +72,9 @@ msgstr "Hiçbir şey yapmaz"
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:818
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:49
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:51
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:910
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:915
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:981
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:911
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:916
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:982
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:137
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:139
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:108
@@ -102,20 +102,20 @@ msgstr "Hiçbir şey yapmaz"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:233
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:290
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:815
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:818
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:814
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:817
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:172
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:179
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:22
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:135
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:903
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:912
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1192
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1195
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:898
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:907
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1190
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1193
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:120
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:155
@@ -123,8 +123,8 @@ msgstr "Hiçbir şey yapmaz"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:172
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:362
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:877
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1054
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:882
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1060
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:87
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:92
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:185
@@ -170,7 +170,7 @@ msgstr "Metadata yazıcısı"
 msgid "Catalog generator"
 msgstr "Katalog oluşturucu"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:15
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:16
 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 "
@@ -180,7 +180,7 @@ msgstr ""
 "içeren bir ZIP dosyası yarat. Bu eklenti, kütüphaneye bir HTML dosyası "
 "eklediğiniz her seferinde çalışır."
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:51
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:52
 msgid ""
 "Character encoding for the input HTML files. Common choices include: cp1252, "
 "latin1, iso-8859-1 and utf-8."
@@ -188,7 +188,7 @@ msgstr ""
 "Girilecek HTML dosyaları için karakter kodlaması. Genel tercihler cp1252, "
 "latin1, iso-8859-1 and utf-8'dir."
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:58
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:59
 msgid ""
 "Create a PMLZ archive containing the PML file and all images in the "
 "directory pmlname_img or images. This plugin is run every time you add a PML "
@@ -198,49 +198,49 @@ msgstr ""
 "içeren bir PMLZ arşivi oluştur. Bu eklenti, kütüphaneye bir PML dosyası "
 "eklediğiniz her seferinde çalışır."
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:90
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:93
 msgid "Extract cover from comic files"
 msgstr "Çizgi roman dosyalarından kapağı çıkart."
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:117
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:128
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:140
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:150
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:160
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:171
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:181
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:191
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:201
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:211
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:221
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:232
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:243
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:255
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:276
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:287
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:297
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:307
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:120
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:131
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:153
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:163
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:174
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:184
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:194
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:204
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:214
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:224
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:235
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:246
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:258
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:279
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:290
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:300
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:310
 msgid "Read metadata from %s files"
 msgstr "%s dosyalarından metadata oku"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:266
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:269
 msgid "Read metadata from ebooks in RAR archives"
 msgstr "RAR arşivleri içindeki ekitaplardan metadata oku"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:318
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:321
 msgid "Read metadata from ebooks in ZIP archives"
 msgstr "Zip arşivlerindeki kitapların metadatasını oku"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:331
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:341
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:351
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:373
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:384
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:394
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:334
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:344
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:354
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:376
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:387
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:397
 msgid "Set metadata in %s files"
 msgstr "%s dosyalarındaki metadatayı belirle"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:362
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:365
 msgid "Set metadata from %s files"
 msgstr "%s dosyalarından metadata belirle"
 
@@ -397,35 +397,35 @@ msgstr ""
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr "Bu profil Amazon Kindle DX'i hedefler."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:31
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
 msgid "Installed plugins"
 msgstr "Yüklü eklentiler"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:33
 msgid "Mapping for filetype plugins"
 msgstr "Dosya türü eklentileri için eşleştirme"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:33
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:34
 msgid "Local plugin customization"
 msgstr "Yerel eklenti özelleştirme"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:34
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
 msgid "Disabled plugins"
 msgstr "Çalışmayan eklentiler"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
 msgid "Enabled plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:83
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:84
 msgid "No valid plugin found in "
 msgstr "de geçerli bir eklenti bulunamadı. "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:460
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:468
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr "%s eklentisi şu geri dönüş ile başlatılamadı:"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:493
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
 msgid ""
 "    %prog options\n"
 "\n"
@@ -437,18 +437,18 @@ msgstr ""
 "    Harici eklentiler yükleyerek Calibre'ye özelleştirin.\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:499
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr ""
 "Eklentiyi içeren ZIP dosyasının bulunduğu yeri belirterek eklenti ekleyin."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 "İsminden yararlanarak özel bir eklentiyi çıkart. Programla gelen eklentiler "
 "üzerinde etkisi yoktur."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:503
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:511
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
@@ -456,15 +456,15 @@ msgstr ""
 "Eklentiyi özelleştir. Eklenti ismiyle özelleştirme dizesini virgülle "
 "ayırarak belirleyin."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:505
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:513
 msgid "List all installed plugins"
 msgstr "Kurulu eklentileri listele"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Enable the named plugin"
 msgstr "İsimlendirilmiş eklentiler geçerli"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Disable the named plugin"
 msgstr "İsimlendirilmiş eklentiler geçersiz"
 
@@ -615,7 +615,7 @@ msgstr "Hanlin V5 serisi eBook readerlar ile bağlantı kur"
 msgid "Communicate with the BOOX eBook reader."
 msgstr "BOOX eBook reader ile bağlantı kur"
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:121
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:123
 msgid ""
 "Comma separated list of directories to send e-books to on the device. The "
 "first one that exists will be used."
@@ -686,7 +686,7 @@ msgstr "Kobo Reader ile iletişim kur"
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:51
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:54
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:57
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:157
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:159
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:64
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:67
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:70
@@ -696,22 +696,22 @@ msgstr "Kobo Reader ile iletişim kur"
 msgid "Getting list of books on device..."
 msgstr "Cihazdaki kitapların listesi alınıyor..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:218
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:258
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:219
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:263
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:244
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:262
 msgid "Removing books from device..."
 msgstr "Cihazdaki kitaplar kaldırılıyor..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:262
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:269
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:267
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:274
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:269
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:274
 msgid "Removing books from device metadata listing..."
 msgstr "Donanım  metadata listesinden  kitaplar çıkarılıyor ..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:274
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:308
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:313
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:208
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:238
 msgid "Adding books to device metadata listing..."
@@ -729,6 +729,10 @@ msgstr "Booq Avant ile iletişim kur"
 msgid "Communicate with the Sweex MM300"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/misc.py:75
+msgid "Communicate with the Pandigital Novel"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:17
 msgid "Communicate with the Nokia 770 internet tablet."
 msgstr "Nokia 770 internet tablet ile bağlantı kur"
@@ -1490,6 +1494,51 @@ msgstr "E-kitap dönüştürmeleri çalışıyor ..."
 msgid "Creating"
 msgstr "Oluşturuluyor"
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/__init__.py:18
+msgid "ePub Fixer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/epubcheck.py:18
+msgid "Workaround epubcheck bugs"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/epubcheck.py:22
+msgid ""
+"Workarounds for bugs in the latest release of epubcheck. epubcheck reports "
+"many things as errors that are not actually errors. %prog will try to detect "
+"these and replace them with constructs that epubcheck likes. This may cause "
+"significant changes to your epub, complain to the epubcheck project."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:19
+msgid ""
+"%prog [options] file.epub\n"
+"\n"
+"Fix common problems in EPUB files that can cause them to be rejected by "
+"poorly designed publishing services.\n"
+"\n"
+"By default, no fixing is done and messages are printed out for each error "
+"detected. Use the options to control which errors are automatically fixed."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:50
+msgid "You must specify an epub file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:17
+msgid "Fix unmanifested files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:21
+msgid ""
+"Fix unmanifested files. %prog can either add them to the manifest or delete "
+"them as specified by the delete unmanifested option."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:32
+msgid "Delete unmanifested files instead of adding them to the manifest"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:56
 msgid ""
 "Extract the contents of the generated EPUB file to the specified directory. "
@@ -1800,11 +1849,11 @@ msgstr "Karikatür"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:98
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:882
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:887
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:543
 msgid "Title"
 msgstr "Eser Adı"
@@ -1813,7 +1862,7 @@ msgstr "Eser Adı"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:364
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:883
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:888
 msgid "Author(s)"
 msgstr "Yazar(lar)"
 
@@ -1836,7 +1885,7 @@ msgstr "Yapımcı"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:67
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:318
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1073
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1079
 msgid "Comments"
 msgstr "Açıklamalar"
 
@@ -1845,7 +1894,7 @@ msgstr "Açıklamalar"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:306
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1069
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1075
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:139
 msgid "Tags"
 msgstr "Etiketler"
@@ -1855,7 +1904,7 @@ msgstr "Etiketler"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:323
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1084
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:87
 msgid "Series"
 msgstr "Seriler"
@@ -1865,7 +1914,7 @@ msgid "Language"
 msgstr "Dil"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:406
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1067
 msgid "Timestamp"
 msgstr "Zaman damgası"
 
@@ -2090,7 +2139,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1226
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1398
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1399
 msgid "Cover"
 msgstr "Kapak"
 
@@ -2129,70 +2178,70 @@ msgstr "Tüm makaleler"
 msgid "This is an Amazon Topaz book. It cannot be processed."
 msgstr "Bu Amazon Topaz kitabı. İşlem yapılamaz."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1399
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1400
 msgid "Title Page"
 msgstr "Başlık Sayfası"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1400
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1401
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:15
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:53
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:194
 msgid "Table of Contents"
 msgstr "İçindekiler"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1401
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1402
 msgid "Index"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1402
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1403
 msgid "Glossary"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1403
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1404
 msgid "Acknowledgements"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1404
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1405
 msgid "Bibliography"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1405
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1406
 msgid "Colophon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1406
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1407
 msgid "Copyright"
 msgstr "Telif Hakkı"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1407
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1408
 msgid "Dedication"
 msgstr "İthaf"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1408
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1409
 msgid "Epigraph"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1409
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1410
 msgid "Foreword"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1410
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1411
 msgid "List of Illustrations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1411
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1412
 msgid "List of Tables"
 msgstr "Tabloların Listesi"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1412
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1413
 msgid "Notes"
 msgstr "Notlar"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1413
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1414
 msgid "Preface"
 msgstr "Önsöz"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1414
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1415
 msgid "Main Text"
 msgstr "Ana Metin"
 
@@ -2236,7 +2285,7 @@ msgstr "Yan Çubuk"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:22
 #: /home/kovid/work/calibre/src/calibre/ebooks/tcr/input.py:23
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:23
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:24
 msgid ""
 "Normally calibre treats blank lines as paragraph markers. With this option "
 "it will assume that every line represents a paragraph instead."
@@ -2244,7 +2293,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:26
 #: /home/kovid/work/calibre/src/calibre/ebooks/tcr/input.py:27
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:27
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:28
 msgid ""
 "Normally calibre treats blank lines as paragraph markers. With this option "
 "it will assume that every line starting with an indent (either a tab or 2+ "
@@ -2373,7 +2422,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
 msgid "Author"
 msgstr "Yazar"
@@ -2508,19 +2557,19 @@ msgid ""
 "slowest."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:33
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:34
 msgid ""
 "Normally extra spaces are condensed into a single space. With this option "
 "all spaces will be displayed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:36
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:37
 msgid ""
 "Run the text input through the markdown pre-processor. To learn more about "
 "markdown see"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:39
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:40
 msgid "Do not insert a Table of Contents into the output text."
 msgstr ""
 
@@ -2682,7 +2731,7 @@ msgstr "Kopyala"
 msgid "Copy to Clipboard"
 msgstr "Panoya Kopyala"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:400
 msgid "Choose Files"
 msgstr "dosyaları Seç"
 
@@ -2697,13 +2746,13 @@ msgid "User annotations generated from main library only"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:75
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:612
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:671
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:708
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:729
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:877
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1060
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:670
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:707
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:728
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:876
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:941
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1059
 msgid "No books selected"
 msgstr ""
 
@@ -2743,209 +2792,209 @@ msgstr ""
 msgid "How many empty books should be added?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:340
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:390
 msgid "Uploading books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:350
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:137
 msgid "Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
 msgid "EPUB Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
 msgid "LRF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
 msgid "HTML Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
 msgid "LIT Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
 msgid "MOBI Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
 msgid "Topaz books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
 msgid "Text books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:359
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
 msgid "PDF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:359
 msgid "Comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:360
 msgid "Archives"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:364
 msgid "Supported books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:399
 msgid "Merged some books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:401
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:400
 msgid ""
 "Some duplicates were found and merged into the following existing books:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:409
 msgid "Failed to read metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:410
 msgid "Failed to read metadata from the following"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:434
 msgid "Add to library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:460
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1229
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:459
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1228
 msgid "No book selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:434
 msgid "No book files found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:456
 msgid "Cannot delete"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:469
 msgid "Choose formats to be deleted"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:488
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:487
 msgid "Choose formats <b>not</b> to be deleted"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:507
 msgid "Cannot delete books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:509
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:508
 msgid "No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:519
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:518
 msgid "Main memory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:519
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:444
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:453
 msgid "Storage Card A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:521
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:520
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:446
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:455
 msgid "Storage Card B"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:525
 msgid "No books to delete"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:526
 msgid "None of the selected books are on the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:544
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:600
 msgid "Deleting books from device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:564
 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/actions.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:585
 msgid ""
 "The selected books will be <b>permanently deleted</b> from your device. Are "
 "you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:610
 msgid "Cannot download metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:627
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
 msgid "social metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
 msgid "covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
 msgid "metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:630
 msgid "Downloading %s for %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:654
 msgid "Failed to download some metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:656
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
 msgid "Failed to download metadata for the following:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:659
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:658
 msgid "Failed to download metadata:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:660
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:659
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:637
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:522
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:949
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:951
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
 msgid "Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:670
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:707
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:669
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:706
 msgid "Cannot edit metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:728
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:731
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:727
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:730
 msgid "Cannot merge books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:732
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:731
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:736
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:735
 msgid ""
 "All book formats and metadata from the selected books will be added to the "
 "<b>first selected book.</b><br><br> The second and subsequently selected "
@@ -2953,7 +3002,7 @@ msgid ""
 "proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:747
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:746
 msgid ""
 "All book formats and metadata from the selected books will be merged into "
 "the <b>first selected book</b>.<br><br>After merger the second and "
@@ -2963,99 +3012,99 @@ msgid ""
 "from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:759
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:758
 msgid ""
 "You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
 "proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:876
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:875
 msgid "Cannot save to disk"
 msgstr "Disk'e kayıt edilemiyor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:878
 msgid "Choose destination directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:912
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:911
 msgid "Error while saving"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:913
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:912
 msgid "There was an error while saving."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:919
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:920
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:921
 msgid "Could not save some books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:922
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:921
 msgid "Click the show details button to see which ones."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
 msgid "No books selected to generate catalog for"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:960
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:959
 msgid "Generating %s catalog..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:965
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:964
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:264
 msgid "No books found"
 msgstr "Kitap bulunmadı"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:966
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:965
 msgid ""
 "No books to catalog\n"
 "Check exclude tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:976
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:975
 msgid "Catalog generated."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:979
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:978
 msgid "Export Catalog Directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:980
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:979
 msgid "Select destination for %s.%s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:996
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:995
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1009
 msgid " fetched."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1059
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1058
 msgid "Cannot convert"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1088
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1087
 msgid "Starting conversion of %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1265
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1264
 msgid "Cannot view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1209
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
 msgid "Choose the format to view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1218
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1217
 msgid "Multiple Books Selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1219
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1218
 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 "
@@ -3063,11 +3112,11 @@ msgid ""
 "continue?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1227
 msgid "Cannot open folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1266
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1265
 msgid "%s has no available formats."
 msgstr ""
 
@@ -3092,7 +3141,7 @@ msgid "The specified directory could not be processed."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:845
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:840
 msgid "No books"
 msgstr "Kitap yok"
 
@@ -3216,15 +3265,15 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:52
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:633
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:637
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:366
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:371
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:385
@@ -3248,12 +3297,12 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:265
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:186
@@ -3283,8 +3332,9 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:313
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1059
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1065
 msgid "Path"
 msgstr ""
 
@@ -3301,8 +3351,8 @@ msgid "Formats"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:25
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:886
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1062
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:891
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1068
 msgid "Collections"
 msgstr ""
 
@@ -3315,12 +3365,12 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:305
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:311
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:317
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1068
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1072
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1074
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:458
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:467
 msgid "None"
 msgstr ""
 
@@ -4379,11 +4429,11 @@ msgid ""
 "href=\"http://calibre-ebook.com/user_manual/xpath.html\">XPath Tutorial</a>."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:127
 msgid "Cover browser could not be loaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:179
 msgid "Browse by covers"
 msgstr ""
 
@@ -4573,128 +4623,124 @@ msgstr ""
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:778
-msgid "Connected "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:846
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:851
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:846
 msgid "Choose format to send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:860
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:855
 msgid "No device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:856
 msgid "Cannot send: No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:868
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:859
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:863
 msgid "No card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:869
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:860
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:910
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:905
 msgid "E-book:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:913
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:908
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:909
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:181
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:915
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:910
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:928
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:923
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:958
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:965
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1057
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1118
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1236
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:953
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:961
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1053
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1115
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1234
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1242
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:959
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:954
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:966
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:962
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:984
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:980
 msgid "Failed to email books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:985
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:981
 msgid "Failed to email the following books:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:989
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:985
 msgid "Sent by email:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1016
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1012
 msgid "News:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1017
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1013
 msgid "Attached is the"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1028
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1024
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1058
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1237
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1054
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1235
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1087
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1084
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1150
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1148
 msgid "Sending news to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1201
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1244
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1243
 msgid ""
 "Could not upload the following books to the device, as no suitable formats "
 "were found. Convert the book(s) to a format supported by your device first."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1305
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1304
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1306
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1305
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -4732,7 +4778,7 @@ msgid "My Books"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:69
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:289
 msgid "Generate catalog"
 msgstr ""
 
@@ -4865,157 +4911,157 @@ msgstr ""
 msgid "Narrow"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:503
 msgid "System port selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:503
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:504
 msgid ""
 "The value <b>%d</b> you have chosen for the content server port is a system "
 "port. Your operating system <b>may</b> not allow the server to run on this "
 "port. To be safe choose a port number larger than 1024."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:524
 msgid "Failed to install command line tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:527
 msgid "Command line tools installed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:528
 msgid "Command line tools installed in"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:529
 msgid ""
 "If you move calibre.app, you have to re-install the command line tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:580
 msgid "No valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:581
 msgid "%s is not a valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:584
 msgid "Choose plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:596
 msgid "Plugin cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:597
 msgid "The plugin: %s cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:606
 msgid "Plugin not customizable"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:607
 msgid "Plugin: %s does not need customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:615
 msgid "Customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:652
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:653
 msgid "Cannot remove builtin plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:653
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:654
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:684
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:685
 msgid "You must select a column to delete it"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:690
 msgid "The selected column is not a custom column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:690
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:691
 #: /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/config/__init__.py:691
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:692
 msgid "Do you really want to delete column %s and all its data?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:758
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:759
 msgid "Error log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:765
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:766
 msgid "Access log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:793
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:794
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:332
 msgid "Failed to start content server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:817
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:818
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:587
 msgid "Select location for books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:824
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:825
 msgid "Invalid size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:825
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:826
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:884
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:889
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:891
 msgid "Invalid database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:885
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:887
 msgid "Invalid database location "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:888
 msgid "<br>Must be a directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:890
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:892
 msgid "Invalid database location.<br>Cannot write to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:895
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:897
 msgid "Must restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:896
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:898
 msgid ""
 "The changes you made require that Calibre be restarted. Please restart as "
 "soon as practical."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:930
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:932
 msgid "Checking database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:950
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:952
 msgid "Failed to check database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:957
 msgid "Some inconsistencies found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:956
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:958
 msgid ""
 "The following books had formats listed in the database that are not actually "
 "available. The entries for the formats have been removed. You should check "
@@ -5143,296 +5189,300 @@ msgstr ""
 msgid "Sending to &device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:167
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr "Tercihler"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
 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/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
 msgid "Browse for the new database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
 msgid "Show notification when &new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
 msgid "Download &social metadata (tags/ratings/etc.) by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
 msgid "&Overwrite author and title by default when fetching metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
 msgid "Default network &timeout:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
 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/config_ui.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
 msgid " seconds"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
 msgid "Normal"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
 msgid "High"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
 msgid "Low"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
 msgid "Job &priority:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
 msgid "Preferred &output format:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
 msgid "Preferred &input format order:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
 msgid "Use &Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
 msgid "Show &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
 msgid "Show &average ratings in the tags browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
 msgid "Search as you type"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
 msgid "&Delete news from library when it is automatically sent to reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
 msgid "Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
 msgid "Small"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
 msgid "&Button size in toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
 msgid "Show &text in toolbar buttons"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
 msgid "Select visible &columns in library view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
 msgid "Remove a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
 msgid "Add a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
 msgid "Edit settings of a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
 msgid "Use internal &viewer for:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
 msgid "User Interface &layout (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
 msgid "Disable &animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
-msgid "Add an email address to which to send books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
-msgid "&Add email"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
-msgid "Make &default"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
-msgid "&Remove email"
+msgid "Show &donate button (restart)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
+msgid "Add an email address to which to send books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
+msgid "&Add email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
+msgid "Make &default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
+msgid "&Remove email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
 msgid ""
 "calibre can send your books to you (or your reader) by email. Emails will be "
 "automatically sent for downloaded news to all email addresses that have Auto-"
 "send checked."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
 msgid "&Maximum number of waiting worker processes (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
 msgid "&Check database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
 msgid "&Install command line tools"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
 msgid "Open calibre &configuration directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
 msgid "Limit the max. simultaneous jobs to the available CPU &cores"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
 msgid "Debug &device detection"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
 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/config_ui.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
 msgid "Server &port:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:212
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:117
 msgid "&Username:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:213
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:119
 msgid "&Password:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
 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/config_ui.py:615
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
 msgid "Max. &cover size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:621
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:214
 msgid "&Show password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
 msgid "Max. &OPDS items per query:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
 msgid "Max. OPDS &ungrouped items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
 msgid "&Start Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:621
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
 msgid "St&op Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:626
 msgid "&Test Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
 msgid "Run server &automatically on startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:628
 msgid "View &server logs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:46
 msgid ""
 "<p>Remember to leave calibre running as the server only runs as long as "
@@ -5443,33 +5493,33 @@ msgid ""
 "the IP address of the computer calibre is running on."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:631
 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/config_ui.py:628
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:632
 msgid "Enable/&Disable plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:633
 msgid "&Customize plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:630
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:634
 msgid "&Remove plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:635
 msgid "Add new plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:632
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:636
 msgid "Plugin &file:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:634
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:638
 msgid "&Add"
 msgstr ""
 
@@ -5507,9 +5557,9 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:31
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:884
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:889
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Date"
 msgstr "Tarih"
@@ -5701,12 +5751,18 @@ msgstr ""
 msgid "ERROR"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:67
+msgid ""
+"All checked books will be <b>permanently deleted</b> from your device. "
+"Please verify the list."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 msgid "Location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1058
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1064
 msgid "Format"
 msgstr ""
 
@@ -6504,6 +6560,10 @@ msgstr ""
 msgid "Add tag to available tags and apply it to current book"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:20
+msgid "%s (was %s)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:501
 msgid "Item is blank"
@@ -6838,146 +6898,162 @@ msgstr ""
 msgid "Save single format to disk..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:53
 msgid "Edit metadata individually"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:56
 msgid "Edit metadata in bulk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:59
 msgid "Download metadata and covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:62
 msgid "Download only metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:64
 msgid "Download only covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:67
 msgid "Download only social metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:73
 msgid "Merge into first selected book - delete others"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:76
 msgid "Merge into first selected book - keep others"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:84
 msgid "Add books from a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:86
 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/init.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:90
 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/init.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:93
 msgid "Add Empty book. (Book entry with no formats)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:102
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
 msgid "Save to disk"
 msgstr "Diske kaydet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Save to disk in a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:106
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:402
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:394
 msgid "Save only %s format to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:110
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:397
 msgid "Save only %s format to disk in a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:119
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
 msgid "View"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:121
 msgid "View specific format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:127
 msgid "Remove selected books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:129
 msgid "Remove files of a specific format from selected books.."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:132
 msgid "Remove all formats from selected books, except..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:135
 msgid "Remove covers from selected books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:138
 msgid "Remove matching books from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:155
 msgid "Convert individually"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:157
 msgid "Bulk convert"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:161
 msgid "Create catalog of books in your calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:169
 msgid "Run welcome wizard"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:205
 msgid "Similar books..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:237
 msgid "Add books to library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:234
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:241
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:253
 msgid "Manage collections"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:328
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:333
 msgid "Cover Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:351
 msgid "Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:372
+msgid "version"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:373
+msgid "created by Kovid Goyal"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:391
+msgid "Connected "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:400
+msgid "Update found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:454
 msgid "Book Details"
 msgstr ""
 
@@ -7061,29 +7137,29 @@ msgid "Rating"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:324
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1084
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:674
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1176
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1182
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:886
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:885
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:890
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1156
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1162
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1165
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr ""
 
@@ -7127,11 +7203,11 @@ msgstr ""
 msgid "Restore default layout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:524
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:525
 msgid "Not allowed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:526
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
@@ -7328,155 +7404,163 @@ msgstr ""
 msgid "try deleting the file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:247
 msgid "calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:249
 msgid "&Restrict to:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:250
 msgid ""
 "Books display will be restricted to those matching the selected saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:251
 msgid "set in ui.py"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:252
 msgid "Advanced search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
 msgid "Alt+S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
 msgid "&Search:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
 msgid ""
 "<p>Search the list of books by title, author, publisher, tags, comments, "
 "etc.<br><br>Words separated by spaces are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
 msgid "Reset Quick Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
-msgid "Choose saved search or enter name for new saved search"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
 msgid "Copy current search text (instead of search name)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
 msgid "Save current search under the name shown in the box"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
 msgid "Delete current saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
 msgid "Add books"
 msgstr "Kitaplar Ekle"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
 msgid "A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
 msgid "Remove books"
 msgstr "Kitapları Sil"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
 msgid "Del"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
 msgid "Edit meta information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
 msgid "E"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
 msgid "Merge book records"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
 msgid "M"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
 msgid "Send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
 msgid "S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
 msgid "Convert E-books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
 msgid "C"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
 msgid "V"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
 msgid "Open containing folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
 msgid "Show book details"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
 msgid "Books by same author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
 msgid "Books in this series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
 msgid "Books by this publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
 msgid "Books with the same tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
 msgid "Configure calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
 msgid "Ctrl+P"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
+msgid "Help"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
+msgid "Browse the calibre User Manual"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
+msgid "F1"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:20
 msgid ""
 "Redirect console output to a dialog window (both stdout and stderr). Useful "
@@ -7503,32 +7587,36 @@ msgstr ""
 msgid "No matches found for this book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:91
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:262
 msgid "Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:313
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:315
 msgid "The selected search will be <b>permanently deleted</b>. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:357
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:392
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:398
 msgid "Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:406
+msgid "Choose saved search or enter name for new saved search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:47
 msgid "({0} of {1})"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:53
 msgid "(all books)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:55
 msgid "({0} of all)"
 msgstr ""
 
@@ -7651,18 +7739,31 @@ msgstr ""
 msgid "Sort by average rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:775
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:772
+msgid "Set the sort order for entries in the Tag Browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:778
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:775
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:778
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:783
+msgid ""
+"When selecting multiple entries in the Tag Browser match any or all of them"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:787
 msgid "Manage &user categories"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:790
+msgid "Add your own categories to the Tag Browser"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182
 msgid "Convert book %d of %d (%s)"
@@ -7688,15 +7789,15 @@ msgstr ""
 msgid "Queueing "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:239
 msgid "Fetch news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:301
 msgid "Convert existing"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:302
 msgid ""
 "The following books have already been converted to %s format. Do you wish to "
 "reconvert them?"
@@ -7710,104 +7811,91 @@ msgstr ""
 msgid "&Donate to support calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:168
 msgid "&Eject connected device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:173
 msgid "&Restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:206
-msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:212
-msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:227
 msgid "Calibre Quick Start Guide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:389
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:381
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:377
 msgid "Cannot configure while there are running jobs."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:382
 msgid "Cannot configure before calibre is restarted."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:425
 msgid "No detailed info available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:426
 msgid "No detailed information is available for books on the device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:486
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:478
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:506
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:487
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:479
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using third party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:492
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:507
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:547
 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."
+"you find it useful, please consider donating to support its development. "
+"Your donation helps keep calibre development going."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:573
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:576
 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/ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:640
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:633
 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/update.py:52
-msgid ""
-"<span style=\"color:red; font-weight:bold\">Latest version: <a "
-"href=\"%s\">%s</a></span>"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/update.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:56
 msgid "Update available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/update.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:57
 msgid ""
 "%s has been updated to version %s. See the <a href=\"http://calibre-"
 "ebook.com/whats-new\">new features</a>. Visit the download page?"
@@ -8285,29 +8373,25 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:270
 msgid ""
 "Library\n"
-"%d\n"
-"books"
+"%d books"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:271
 msgid ""
 "Reader\n"
-"%s\n"
-"available"
+"%s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:272
 msgid ""
 "Card A\n"
-"%s\n"
-"available"
+"%s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:273
 msgid ""
 "Card B\n"
-"%s\n"
-"available"
+"%s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:277
@@ -8330,35 +8414,39 @@ msgstr ""
 msgid "Books located at"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:306
+msgid "free"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:557
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:558
 msgid "Upper Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:559
 msgid "Lower Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:560
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:561
 msgid "Title Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:974
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:983
 msgid "Drag to resize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1015
 msgid "Show"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1012
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1022
 msgid "Hide"
 msgstr ""
 
@@ -9627,83 +9715,83 @@ msgstr ""
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:706
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:708
 msgid "Download finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:708
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:710
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:714
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:716
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:716
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:718
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:718
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:720
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:807
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:809
 msgid "Could not fetch article. Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:828
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:830
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:833
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:835
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:839
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:841
 msgid "Trying to download cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:841
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:922
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:924
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:938
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:940
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:948
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:950
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:960
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
 msgid "Downloading cover from %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1002
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1190
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1192
 msgid "Untitled Article"
 msgstr "Başlıksız Yazı"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1261
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1263
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1272
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1274
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1289
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1291
 msgid "Fetching feed"
 msgstr "Besleme alınıyor"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1436
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1438
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
@@ -9711,7 +9799,7 @@ msgstr ""
 "Giriş başarısız , calibre Süreli servisleri için kullanıcı adınız ve "
 "şifrenizi kontrol ediniz ."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1452
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1454
 msgid ""
 "You do not have permission to download this issue. Either your subscription "
 "has expired or you have exceeded the maximum allowed downloads for today."
diff --git a/src/calibre/translations/vi.po b/src/calibre/translations/vi.po
index 5685a45f8d..e84d46bd0e 100644
--- a/src/calibre/translations/vi.po
+++ b/src/calibre/translations/vi.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-07-03 01:21+0000\n"
-"PO-Revision-Date: 2010-07-02 18:13+0000\n"
+"POT-Creation-Date: 2010-07-09 22:00+0000\n"
+"PO-Revision-Date: 2010-07-09 20:11+0000\n"
 "Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Vietnamese <vi@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: 2010-07-03 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-07-10 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43
@@ -27,10 +27,10 @@ msgstr "hoàn toàn không thực thi"
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:71
 #: /home/kovid/work/calibre/src/calibre/devices/prs500/books.py:267
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:466
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:492
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:396
-#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:98
-#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:101
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:97
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:100
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/metadata.py:56
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:428
 #: /home/kovid/work/calibre/src/calibre/ebooks/fb2/input.py:67
@@ -72,9 +72,9 @@ msgstr "hoàn toàn không thực thi"
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:818
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:49
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:51
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:910
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:915
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:981
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:911
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:916
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:982
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:137
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:139
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:108
@@ -102,20 +102,20 @@ msgstr "hoàn toàn không thực thi"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:233
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:290
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:815
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:818
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:814
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:817
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:172
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:179
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:22
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:135
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:903
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:912
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1192
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1195
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:898
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:907
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1190
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1193
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:120
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:155
@@ -123,8 +123,8 @@ msgstr "hoàn toàn không thực thi"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:172
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:362
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:877
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1054
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:882
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1060
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:87
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:92
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:185
@@ -170,7 +170,7 @@ msgstr "Ghi thông tin mô tả"
 msgid "Catalog generator"
 msgstr "Khởi tạo danh mục tự động"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:15
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:16
 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 "
@@ -180,7 +180,7 @@ msgstr ""
 "tin nén chứa tất cả các file được dẫn tới. Plugin này sẽ chạy mỗi khi bạn bổ "
 "sung một tập tin HTML vào thư viện."
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:51
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:52
 msgid ""
 "Character encoding for the input HTML files. Common choices include: cp1252, "
 "latin1, iso-8859-1 and utf-8."
@@ -188,7 +188,7 @@ msgstr ""
 "Định dạng ngôn ngữ cho tập tin HTML đầu vào. Lựa chọn thông thường bao gồm: "
 "cp1252, latin1, iso-8859-1 và utf-8"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:58
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:59
 msgid ""
 "Create a PMLZ archive containing the PML file and all images in the "
 "directory pmlname_img or images. This plugin is run every time you add a PML "
@@ -198,49 +198,49 @@ msgstr ""
 "pmlname_img hoặc \"images\". Tiện ích này sẽ khởi chạy mỗi khi bạn bổ sung "
 "một tập tin PML vào thư viện."
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:90
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:93
 msgid "Extract cover from comic files"
 msgstr "Trích bìa từ các tập tin truyện tranh"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:117
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:128
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:140
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:150
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:160
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:171
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:181
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:191
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:201
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:211
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:221
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:232
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:243
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:255
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:276
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:287
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:297
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:307
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:120
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:131
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:153
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:163
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:174
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:184
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:194
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:204
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:214
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:224
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:235
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:246
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:258
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:279
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:290
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:300
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:310
 msgid "Read metadata from %s files"
 msgstr "Đọc thông tin mô tả từ tập tin %s"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:266
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:269
 msgid "Read metadata from ebooks in RAR archives"
 msgstr "Đọc thông tin mô tả từ ebook trong các tập tin nén kiểu RAR"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:318
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:321
 msgid "Read metadata from ebooks in ZIP archives"
 msgstr "Đọc thông tin mô tả từ ebook trong các tập tin nén kiểu ZIP"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:331
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:341
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:351
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:373
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:384
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:394
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:334
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:344
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:354
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:376
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:387
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:397
 msgid "Set metadata in %s files"
 msgstr "Thiết lập thông tin mô tả trong tập tin %s"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:362
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:365
 msgid "Set metadata from %s files"
 msgstr "Thiết lập thông tin mô tả trong tập tin %s"
 
@@ -394,35 +394,35 @@ msgstr ""
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr "Hồ sơ này dùng cho Amazon Kindle DX"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:31
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
 msgid "Installed plugins"
 msgstr "Các tiện ích đã được cài đặt"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:33
 msgid "Mapping for filetype plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:33
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:34
 msgid "Local plugin customization"
 msgstr "Tuỳ chỉnh các tiện ích hiện có"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:34
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
 msgid "Disabled plugins"
 msgstr "Tiện ích đã bị vô hiệu hoá"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
 msgid "Enabled plugins"
 msgstr "Tiện ích đang được sử dụng"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:83
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:84
 msgid "No valid plugin found in "
 msgstr "Không tìm thấy tiện ích nào đáp ứng yêu cầu trong "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:460
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:468
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr "Quá trình khởi chạy tiện ích %s thất bại với các thông tin sau"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:493
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
 msgid ""
 "    %prog options\n"
 "\n"
@@ -430,18 +430,18 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:499
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr ""
 "Bổ sung một tiện ích bằng cách chỉ ra đường dẫn tới tập tin nén chứa nó."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr ""
 "Xoá một tiện ích tự tạo theo tên. Không có tác dụng với các tiện ích đi kèm "
 "phần mềm ban đầu."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:503
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:511
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
@@ -449,15 +449,15 @@ msgstr ""
 "Tuỳ biến tiện ích. Chỉ ra tên của tiện ích và các đoạn tuỳ biến được ngăn "
 "cách bằng dấu phẩy."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:505
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:513
 msgid "List all installed plugins"
 msgstr "Danh mục tất cả các tiện ích đã được cài đặt."
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Enable the named plugin"
 msgstr "Cho phép khởi chạy tiện ích có tên sau"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Disable the named plugin"
 msgstr "Cấm khởi chạy các tiện ích có tên sau"
 
@@ -617,7 +617,7 @@ msgstr ""
 msgid "Communicate with the BOOX eBook reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:121
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:123
 msgid ""
 "Comma separated list of directories to send e-books to on the device. The "
 "first one that exists will be used."
@@ -688,7 +688,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:51
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:54
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:57
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:157
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:159
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:64
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:67
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:70
@@ -698,22 +698,22 @@ msgstr ""
 msgid "Getting list of books on device..."
 msgstr "Đang lấy danh mục sách có trên thiết bị...."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:218
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:258
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:219
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:263
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:244
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:262
 msgid "Removing books from device..."
 msgstr "Đang xoá sách khỏi thiết bị ..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:262
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:269
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:267
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:274
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:269
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:274
 msgid "Removing books from device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:274
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:308
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:313
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:208
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:238
 msgid "Adding books to device metadata listing..."
@@ -731,6 +731,10 @@ msgstr ""
 msgid "Communicate with the Sweex MM300"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/misc.py:75
+msgid "Communicate with the Pandigital Novel"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:17
 msgid "Communicate with the Nokia 770 internet tablet."
 msgstr ""
@@ -1516,6 +1520,51 @@ msgstr ""
 msgid "Creating"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/__init__.py:18
+msgid "ePub Fixer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/epubcheck.py:18
+msgid "Workaround epubcheck bugs"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/epubcheck.py:22
+msgid ""
+"Workarounds for bugs in the latest release of epubcheck. epubcheck reports "
+"many things as errors that are not actually errors. %prog will try to detect "
+"these and replace them with constructs that epubcheck likes. This may cause "
+"significant changes to your epub, complain to the epubcheck project."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:19
+msgid ""
+"%prog [options] file.epub\n"
+"\n"
+"Fix common problems in EPUB files that can cause them to be rejected by "
+"poorly designed publishing services.\n"
+"\n"
+"By default, no fixing is done and messages are printed out for each error "
+"detected. Use the options to control which errors are automatically fixed."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:50
+msgid "You must specify an epub file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:17
+msgid "Fix unmanifested files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:21
+msgid ""
+"Fix unmanifested files. %prog can either add them to the manifest or delete "
+"them as specified by the delete unmanifested option."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:32
+msgid "Delete unmanifested files instead of adding them to the manifest"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:56
 msgid ""
 "Extract the contents of the generated EPUB file to the specified directory. "
@@ -1826,11 +1875,11 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:98
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:882
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:887
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:543
 msgid "Title"
 msgstr "Tựa"
@@ -1839,7 +1888,7 @@ msgstr "Tựa"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:364
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:883
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:888
 msgid "Author(s)"
 msgstr "Tác giả"
 
@@ -1862,7 +1911,7 @@ msgstr "Chủ nhiệm"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:67
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:318
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1073
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1079
 msgid "Comments"
 msgstr "Bình luận"
 
@@ -1871,7 +1920,7 @@ msgstr "Bình luận"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:306
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1069
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1075
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:139
 msgid "Tags"
 msgstr "Thẻ"
@@ -1881,7 +1930,7 @@ msgstr "Thẻ"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:323
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1084
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:87
 msgid "Series"
 msgstr "Loạt sách"
@@ -1891,7 +1940,7 @@ msgid "Language"
 msgstr "Ngôn ngữ"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:406
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1067
 msgid "Timestamp"
 msgstr "Nhãn thời gian"
 
@@ -2122,7 +2171,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1226
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1398
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1399
 msgid "Cover"
 msgstr "Bìa sách"
 
@@ -2161,70 +2210,70 @@ msgstr ""
 msgid "This is an Amazon Topaz book. It cannot be processed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1399
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1400
 msgid "Title Page"
 msgstr "Trang bìa"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1400
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1401
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:15
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:53
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:194
 msgid "Table of Contents"
 msgstr "Mục lục"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1401
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1402
 msgid "Index"
 msgstr "Chỉ mục"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1402
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1403
 msgid "Glossary"
 msgstr "Từ điển thuật ngữ"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1403
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1404
 msgid "Acknowledgements"
 msgstr "Lời cảm ơn"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1404
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1405
 msgid "Bibliography"
 msgstr "Mục lục thư tịch"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1405
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1406
 msgid "Colophon"
 msgstr "Lời ghi cuối sách"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1406
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1407
 msgid "Copyright"
 msgstr "Tác quyền"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1407
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1408
 msgid "Dedication"
 msgstr "Lời đề tặng"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1408
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1409
 msgid "Epigraph"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1409
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1410
 msgid "Foreword"
 msgstr "Lời nói đầu"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1410
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1411
 msgid "List of Illustrations"
 msgstr "Danh sách hình ảnh"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1411
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1412
 msgid "List of Tables"
 msgstr "Danh sách Bảng biểu"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1412
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1413
 msgid "Notes"
 msgstr "Chú thích"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1413
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1414
 msgid "Preface"
 msgstr "Lời nói đầu"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1414
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1415
 msgid "Main Text"
 msgstr ""
 
@@ -2268,7 +2317,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:22
 #: /home/kovid/work/calibre/src/calibre/ebooks/tcr/input.py:23
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:23
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:24
 msgid ""
 "Normally calibre treats blank lines as paragraph markers. With this option "
 "it will assume that every line represents a paragraph instead."
@@ -2276,7 +2325,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:26
 #: /home/kovid/work/calibre/src/calibre/ebooks/tcr/input.py:27
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:27
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:28
 msgid ""
 "Normally calibre treats blank lines as paragraph markers. With this option "
 "it will assume that every line starting with an indent (either a tab or 2+ "
@@ -2422,7 +2471,7 @@ msgstr ""
 "Lấy thông tin về một tập tin PDF.\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
 msgid "Author"
 msgstr "Tác giả"
@@ -2557,19 +2606,19 @@ msgid ""
 "slowest."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:33
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:34
 msgid ""
 "Normally extra spaces are condensed into a single space. With this option "
 "all spaces will be displayed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:36
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:37
 msgid ""
 "Run the text input through the markdown pre-processor. To learn more about "
 "markdown see"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:39
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:40
 msgid "Do not insert a Table of Contents into the output text."
 msgstr ""
 
@@ -2731,7 +2780,7 @@ msgstr ""
 msgid "Copy to Clipboard"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:400
 msgid "Choose Files"
 msgstr ""
 
@@ -2746,13 +2795,13 @@ msgid "User annotations generated from main library only"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:75
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:612
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:671
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:708
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:729
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:877
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1060
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:670
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:707
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:728
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:876
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:941
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1059
 msgid "No books selected"
 msgstr ""
 
@@ -2792,209 +2841,209 @@ msgstr ""
 msgid "How many empty books should be added?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:340
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:390
 msgid "Uploading books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:350
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:137
 msgid "Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
 msgid "EPUB Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
 msgid "LRF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
 msgid "HTML Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
 msgid "LIT Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
 msgid "MOBI Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
 msgid "Topaz books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
 msgid "Text books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:359
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
 msgid "PDF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:359
 msgid "Comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:360
 msgid "Archives"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:364
 msgid "Supported books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:399
 msgid "Merged some books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:401
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:400
 msgid ""
 "Some duplicates were found and merged into the following existing books:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:409
 msgid "Failed to read metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:410
 msgid "Failed to read metadata from the following"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:434
 msgid "Add to library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:460
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1229
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:459
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1228
 msgid "No book selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:434
 msgid "No book files found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:456
 msgid "Cannot delete"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:469
 msgid "Choose formats to be deleted"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:488
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:487
 msgid "Choose formats <b>not</b> to be deleted"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:507
 msgid "Cannot delete books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:509
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:508
 msgid "No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:519
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:518
 msgid "Main memory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:519
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:444
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:453
 msgid "Storage Card A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:521
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:520
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:446
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:455
 msgid "Storage Card B"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:525
 msgid "No books to delete"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:526
 msgid "None of the selected books are on the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:544
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:600
 msgid "Deleting books from device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:564
 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/actions.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:585
 msgid ""
 "The selected books will be <b>permanently deleted</b> from your device. Are "
 "you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:610
 msgid "Cannot download metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:627
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
 msgid "social metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
 msgid "covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
 msgid "metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:630
 msgid "Downloading %s for %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:654
 msgid "Failed to download some metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:656
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
 msgid "Failed to download metadata for the following:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:659
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:658
 msgid "Failed to download metadata:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:660
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:659
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:637
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:522
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:949
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:951
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
 msgid "Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:670
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:707
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:669
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:706
 msgid "Cannot edit metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:728
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:731
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:727
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:730
 msgid "Cannot merge books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:732
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:731
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:736
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:735
 msgid ""
 "All book formats and metadata from the selected books will be added to the "
 "<b>first selected book.</b><br><br> The second and subsequently selected "
@@ -3002,7 +3051,7 @@ msgid ""
 "proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:747
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:746
 msgid ""
 "All book formats and metadata from the selected books will be merged into "
 "the <b>first selected book</b>.<br><br>After merger the second and "
@@ -3012,99 +3061,99 @@ msgid ""
 "from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:759
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:758
 msgid ""
 "You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
 "proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:876
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:875
 msgid "Cannot save to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:878
 msgid "Choose destination directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:912
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:911
 msgid "Error while saving"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:913
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:912
 msgid "There was an error while saving."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:919
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:920
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:921
 msgid "Could not save some books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:922
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:921
 msgid "Click the show details button to see which ones."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
 msgid "No books selected to generate catalog for"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:960
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:959
 msgid "Generating %s catalog..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:965
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:964
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:264
 msgid "No books found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:966
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:965
 msgid ""
 "No books to catalog\n"
 "Check exclude tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:976
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:975
 msgid "Catalog generated."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:979
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:978
 msgid "Export Catalog Directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:980
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:979
 msgid "Select destination for %s.%s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:996
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:995
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1009
 msgid " fetched."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1059
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1058
 msgid "Cannot convert"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1088
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1087
 msgid "Starting conversion of %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1265
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1264
 msgid "Cannot view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1209
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
 msgid "Choose the format to view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1218
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1217
 msgid "Multiple Books Selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1219
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1218
 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 "
@@ -3112,11 +3161,11 @@ msgid ""
 "continue?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1227
 msgid "Cannot open folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1266
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1265
 msgid "%s has no available formats."
 msgstr ""
 
@@ -3141,7 +3190,7 @@ msgid "The specified directory could not be processed."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:845
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:840
 msgid "No books"
 msgstr ""
 
@@ -3265,15 +3314,15 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:52
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:633
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:637
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:366
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:371
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:385
@@ -3297,12 +3346,12 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:265
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:186
@@ -3332,8 +3381,9 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:313
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1059
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1065
 msgid "Path"
 msgstr ""
 
@@ -3350,8 +3400,8 @@ msgid "Formats"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:25
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:886
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1062
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:891
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1068
 msgid "Collections"
 msgstr ""
 
@@ -3364,12 +3414,12 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:305
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:311
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:317
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1068
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1072
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1074
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:458
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:467
 msgid "None"
 msgstr ""
 
@@ -4428,11 +4478,11 @@ msgid ""
 "href=\"http://calibre-ebook.com/user_manual/xpath.html\">XPath Tutorial</a>."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:127
 msgid "Cover browser could not be loaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:179
 msgid "Browse by covers"
 msgstr ""
 
@@ -4622,128 +4672,124 @@ msgstr ""
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:778
-msgid "Connected "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:846
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "selected to send"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:851
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:846
 msgid "Choose format to send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:860
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:855
 msgid "No device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:856
 msgid "Cannot send: No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:868
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:859
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:863
 msgid "No card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:869
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:860
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "Cannot send: Device has no storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:910
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:905
 msgid "E-book:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:913
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:908
 msgid "Attached, you will find the e-book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:909
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:181
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:915
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:910
 msgid "in the %s format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:928
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:923
 msgid "Sending email to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:958
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:965
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1057
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1118
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1236
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:953
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:961
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1053
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1115
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1234
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1242
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:959
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:954
 msgid "Auto convert the following books before sending via email?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:966
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:962
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:984
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:980
 msgid "Failed to email books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:985
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:981
 msgid "Failed to email the following books:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:989
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:985
 msgid "Sent by email:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1016
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1012
 msgid "News:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1017
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1013
 msgid "Attached is the"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1028
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1024
 msgid "Sent news to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1058
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1237
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1054
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1235
 msgid "Auto convert the following books before uploading to the device?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1087
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1084
 msgid "Sending catalogs to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1150
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1148
 msgid "Sending news to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1201
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1244
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1243
 msgid ""
 "Could not upload the following books to the device, as no suitable formats "
 "were found. Convert the book(s) to a format supported by your device first."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1305
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1304
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1306
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1305
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
@@ -4781,7 +4827,7 @@ msgid "My Books"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:69
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:289
 msgid "Generate catalog"
 msgstr ""
 
@@ -4914,157 +4960,157 @@ msgstr ""
 msgid "Narrow"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:503
 msgid "System port selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:503
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:504
 msgid ""
 "The value <b>%d</b> you have chosen for the content server port is a system "
 "port. Your operating system <b>may</b> not allow the server to run on this "
 "port. To be safe choose a port number larger than 1024."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:524
 msgid "Failed to install command line tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:527
 msgid "Command line tools installed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:528
 msgid "Command line tools installed in"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:529
 msgid ""
 "If you move calibre.app, you have to re-install the command line tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:580
 msgid "No valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:581
 msgid "%s is not a valid plugin path"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:584
 msgid "Choose plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:596
 msgid "Plugin cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:597
 msgid "The plugin: %s cannot be disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:606
 msgid "Plugin not customizable"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:607
 msgid "Plugin: %s does not need customization"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:615
 msgid "Customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:652
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:653
 msgid "Cannot remove builtin plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:653
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:654
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:684
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:685
 msgid "You must select a column to delete it"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:690
 msgid "The selected column is not a custom column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:690
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:691
 #: /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/config/__init__.py:691
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:692
 msgid "Do you really want to delete column %s and all its data?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:758
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:759
 msgid "Error log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:765
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:766
 msgid "Access log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:793
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:794
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:332
 msgid "Failed to start content server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:817
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:818
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:587
 msgid "Select location for books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:824
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:825
 msgid "Invalid size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:825
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:826
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:884
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:889
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:891
 msgid "Invalid database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:885
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:887
 msgid "Invalid database location "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:888
 msgid "<br>Must be a directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:890
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:892
 msgid "Invalid database location.<br>Cannot write to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:895
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:897
 msgid "Must restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:896
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:898
 msgid ""
 "The changes you made require that Calibre be restarted. Please restart as "
 "soon as practical."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:930
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:932
 msgid "Checking database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:950
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:952
 msgid "Failed to check database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:957
 msgid "Some inconsistencies found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:956
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:958
 msgid ""
 "The following books had formats listed in the database that are not actually "
 "available. The entries for the formats have been removed. You should check "
@@ -5192,296 +5238,300 @@ msgstr ""
 msgid "Sending to &device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:167
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
 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/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
 msgid "Browse for the new database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
 msgid "Show notification when &new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
 msgid "Download &social metadata (tags/ratings/etc.) by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
 msgid "&Overwrite author and title by default when fetching metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
 msgid "Default network &timeout:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
 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/config_ui.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
 msgid " seconds"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
 msgid "Normal"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
 msgid "High"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
 msgid "Low"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
 msgid "Job &priority:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
 msgid "Preferred &output format:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
 msgid "Preferred &input format order:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
 msgid "Use &Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
 msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
 msgid "Show &notifications in system tray"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
 msgid "Show &average ratings in the tags browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
 msgid "Search as you type"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
 msgid "&Delete news from library when it is automatically sent to reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
 msgid "Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
 msgid "Small"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
 msgid "&Button size in toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
 msgid "Show &text in toolbar buttons"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
 msgid "Select visible &columns in library view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
 msgid "Remove a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
 msgid "Add a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
 msgid "Edit settings of a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
 msgid "Use internal &viewer for:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
 msgid "User Interface &layout (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
 msgid "Disable &animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
-msgid "Add an email address to which to send books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
-msgid "&Add email"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
-msgid "Make &default"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
-msgid "&Remove email"
+msgid "Show &donate button (restart)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
+msgid "Add an email address to which to send books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
+msgid "&Add email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
+msgid "Make &default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
+msgid "&Remove email"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
 msgid ""
 "calibre can send your books to you (or your reader) by email. Emails will be "
 "automatically sent for downloaded news to all email addresses that have Auto-"
 "send checked."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
 msgid "&Maximum number of waiting worker processes (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
 msgid "&Check database integrity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
 msgid "&Install command line tools"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
 msgid "Open calibre &configuration directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
 msgid "Limit the max. simultaneous jobs to the available CPU &cores"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
 msgid "Debug &device detection"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
 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/config_ui.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
 msgid "Server &port:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:212
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:117
 msgid "&Username:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:213
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:119
 msgid "&Password:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
 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/config_ui.py:615
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
 msgid "Max. &cover size:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:621
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:214
 msgid "&Show password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
 msgid "Max. &OPDS items per query:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
 msgid "Max. OPDS &ungrouped items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
 msgid "&Start Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:621
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
 msgid "St&op Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:626
 msgid "&Test Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
 msgid "Run server &automatically on startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:628
 msgid "View &server logs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:46
 msgid ""
 "<p>Remember to leave calibre running as the server only runs as long as "
@@ -5492,33 +5542,33 @@ msgid ""
 "the IP address of the computer calibre is running on."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:631
 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/config_ui.py:628
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:632
 msgid "Enable/&Disable plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:633
 msgid "&Customize plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:630
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:634
 msgid "&Remove plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:635
 msgid "Add new plugin"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:632
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:636
 msgid "Plugin &file:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:634
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:638
 msgid "&Add"
 msgstr ""
 
@@ -5556,9 +5606,9 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:31
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:884
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:889
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Date"
 msgstr ""
@@ -5750,12 +5800,18 @@ msgstr ""
 msgid "ERROR"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:67
+msgid ""
+"All checked books will be <b>permanently deleted</b> from your device. "
+"Please verify the list."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 msgid "Location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1058
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1064
 msgid "Format"
 msgstr ""
 
@@ -6554,6 +6610,10 @@ msgstr ""
 msgid "Add tag to available tags and apply it to current book"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:20
+msgid "%s (was %s)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:501
 msgid "Item is blank"
@@ -6888,146 +6948,162 @@ msgstr ""
 msgid "Save single format to disk..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:53
 msgid "Edit metadata individually"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:56
 msgid "Edit metadata in bulk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:59
 msgid "Download metadata and covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:62
 msgid "Download only metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:64
 msgid "Download only covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:67
 msgid "Download only social metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:73
 msgid "Merge into first selected book - delete others"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:76
 msgid "Merge into first selected book - keep others"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:84
 msgid "Add books from a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:86
 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/init.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:90
 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/init.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:93
 msgid "Add Empty book. (Book entry with no formats)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:102
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
 msgid "Save to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Save to disk in a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:106
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:402
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:394
 msgid "Save only %s format to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:110
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:397
 msgid "Save only %s format to disk in a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:119
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
 msgid "View"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:121
 msgid "View specific format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:127
 msgid "Remove selected books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:129
 msgid "Remove files of a specific format from selected books.."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:132
 msgid "Remove all formats from selected books, except..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:135
 msgid "Remove covers from selected books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:138
 msgid "Remove matching books from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:155
 msgid "Convert individually"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:157
 msgid "Bulk convert"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:161
 msgid "Create catalog of books in your calibre library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:169
 msgid "Run welcome wizard"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:205
 msgid "Similar books..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:237
 msgid "Add books to library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:234
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:241
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:253
 msgid "Manage collections"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:328
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:333
 msgid "Cover Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:351
 msgid "Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:372
+msgid "version"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:373
+msgid "created by Kovid Goyal"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:391
+msgid "Connected "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:400
+msgid "Update found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:454
 msgid "Book Details"
 msgstr ""
 
@@ -7111,29 +7187,29 @@ msgid "Rating"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:324
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1084
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:674
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1176
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1182
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:886
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:885
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:890
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1156
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1162
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1165
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr ""
 
@@ -7177,11 +7253,11 @@ msgstr ""
 msgid "Restore default layout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:524
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:525
 msgid "Not allowed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:526
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
@@ -7378,155 +7454,163 @@ msgstr ""
 msgid "try deleting the file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:247
 msgid "calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:249
 msgid "&Restrict to:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:250
 msgid ""
 "Books display will be restricted to those matching the selected saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:251
 msgid "set in ui.py"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:252
 msgid "Advanced search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
 msgid "Alt+S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
 msgid "&Search:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
 msgid ""
 "<p>Search the list of books by title, author, publisher, tags, comments, "
 "etc.<br><br>Words separated by spaces are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
 msgid "Reset Quick Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
-msgid "Choose saved search or enter name for new saved search"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
 msgid "Copy current search text (instead of search name)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
 msgid "Save current search under the name shown in the box"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
 msgid "Delete current saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
 msgid "Add books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
 msgid "A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
 msgid "Remove books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
 msgid "Del"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
 msgid "Edit meta information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
 msgid "E"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
 msgid "Merge book records"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
 msgid "M"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
 msgid "Send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
 msgid "S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
 msgid "Convert E-books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
 msgid "C"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
 msgid "V"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
 msgid "Open containing folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
 msgid "Show book details"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
 msgid "Books by same author"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
 msgid "Books in this series"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
 msgid "Books by this publisher"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
 msgid "Books with the same tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
 msgid "Configure calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
 msgid "Ctrl+P"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
+msgid "Help"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
+msgid "Browse the calibre User Manual"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
+msgid "F1"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:20
 msgid ""
 "Redirect console output to a dialog window (both stdout and stderr). Useful "
@@ -7553,32 +7637,36 @@ msgstr ""
 msgid "No matches found for this book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:91
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:262
 msgid "Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:313
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:315
 msgid "The selected search will be <b>permanently deleted</b>. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:357
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:392
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:398
 msgid "Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:406
+msgid "Choose saved search or enter name for new saved search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:47
 msgid "({0} of {1})"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:53
 msgid "(all books)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:55
 msgid "({0} of all)"
 msgstr ""
 
@@ -7701,18 +7789,31 @@ msgstr ""
 msgid "Sort by average rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:775
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:772
+msgid "Set the sort order for entries in the Tag Browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:778
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:775
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:778
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:783
+msgid ""
+"When selecting multiple entries in the Tag Browser match any or all of them"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:787
 msgid "Manage &user categories"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:790
+msgid "Add your own categories to the Tag Browser"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182
 msgid "Convert book %d of %d (%s)"
@@ -7738,15 +7839,15 @@ msgstr ""
 msgid "Queueing "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:239
 msgid "Fetch news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:301
 msgid "Convert existing"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:302
 msgid ""
 "The following books have already been converted to %s format. Do you wish to "
 "reconvert them?"
@@ -7760,104 +7861,91 @@ msgstr ""
 msgid "&Donate to support calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:168
 msgid "&Eject connected device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:173
 msgid "&Restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:206
-msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:212
-msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:227
 msgid "Calibre Quick Start Guide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:389
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:381
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:377
 msgid "Cannot configure while there are running jobs."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:382
 msgid "Cannot configure before calibre is restarted."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:425
 msgid "No detailed info available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:426
 msgid "No detailed information is available for books on the device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:486
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:478
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:506
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:487
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:479
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using third party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:492
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:507
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:547
 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."
+"you find it useful, please consider donating to support its development. "
+"Your donation helps keep calibre development going."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:573
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:576
 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/ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:640
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:633
 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/update.py:52
-msgid ""
-"<span style=\"color:red; font-weight:bold\">Latest version: <a "
-"href=\"%s\">%s</a></span>"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/update.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:56
 msgid "Update available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/update.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:57
 msgid ""
 "%s has been updated to version %s. See the <a href=\"http://calibre-"
 "ebook.com/whats-new\">new features</a>. Visit the download page?"
@@ -8335,29 +8423,25 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:270
 msgid ""
 "Library\n"
-"%d\n"
-"books"
+"%d books"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:271
 msgid ""
 "Reader\n"
-"%s\n"
-"available"
+"%s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:272
 msgid ""
 "Card A\n"
-"%s\n"
-"available"
+"%s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:273
 msgid ""
 "Card B\n"
-"%s\n"
-"available"
+"%s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:277
@@ -8380,35 +8464,39 @@ msgstr ""
 msgid "Books located at"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:306
+msgid "free"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:557
 msgid "Change Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:558
 msgid "Upper Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:559
 msgid "Lower Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:560
 msgid "Swap Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:561
 msgid "Title Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:974
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:983
 msgid "Drag to resize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1015
 msgid "Show"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1012
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1022
 msgid "Hide"
 msgstr ""
 
@@ -9677,89 +9765,89 @@ msgstr ""
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:706
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:708
 msgid "Download finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:708
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:710
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:714
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:716
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:716
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:718
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:718
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:720
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:807
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:809
 msgid "Could not fetch article. Run with -vv to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:828
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:830
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:833
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:835
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:839
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:841
 msgid "Trying to download cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:841
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:922
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:924
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:938
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:940
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:948
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:950
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:960
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
 msgid "Downloading cover from %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1002
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1190
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1192
 msgid "Untitled Article"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1261
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1263
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1272
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1274
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1289
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1291
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1436
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1438
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1452
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1454
 msgid ""
 "You do not have permission to download this issue. Either your subscription "
 "has expired or you have exceeded the maximum allowed downloads for today."
diff --git a/src/calibre/translations/zh_CN.po b/src/calibre/translations/zh_CN.po
index 06c0ac014f..9450db0caf 100644
--- a/src/calibre/translations/zh_CN.po
+++ b/src/calibre/translations/zh_CN.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-07-03 01:21+0000\n"
-"PO-Revision-Date: 2010-07-03 15:22+0000\n"
+"POT-Creation-Date: 2010-07-10 16:12+0000\n"
+"PO-Revision-Date: 2010-07-13 13:07+0000\n"
 "Last-Translator: Li Fanxi <Unknown>\n"
 "Language-Team: Simplified Chinese <wanglihao@gmail.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-04 03:44+0000\n"
+"X-Launchpad-Export-Date: 2010-07-14 03:35+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: CHINA\n"
 "X-Poedit-Language: Chinese\n"
@@ -29,10 +29,10 @@ msgstr "不做任何处理"
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:71
 #: /home/kovid/work/calibre/src/calibre/devices/prs500/books.py:267
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:466
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:396
-#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:98
-#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:101
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:492
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:398
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:97
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:100
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/metadata.py:56
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:428
 #: /home/kovid/work/calibre/src/calibre/ebooks/fb2/input.py:67
@@ -74,9 +74,9 @@ msgstr "不做任何处理"
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:818
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:49
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:51
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:910
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:915
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:981
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:911
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:916
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:982
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:137
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:139
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:108
@@ -104,20 +104,20 @@ msgstr "不做任何处理"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:233
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:290
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:815
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:818
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:814
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:817
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:172
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:179
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:22
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:135
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:903
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:912
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1192
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1195
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:899
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:908
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1191
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1194
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:120
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:155
@@ -125,8 +125,8 @@ msgstr "不做任何处理"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:172
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:362
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:877
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1054
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:882
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1060
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:87
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:92
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:185
@@ -172,20 +172,20 @@ msgstr "元数据生成器"
 msgid "Catalog generator"
 msgstr "类目生成器"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:15
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:16
 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 "保持所有的 HTML 文件中的超链接并将所有链接的文件放入一个压缩文件内。该插件此后将在添加 HTML 文件到书库时自动运行。"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:51
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:52
 msgid ""
 "Character encoding for the input HTML files. Common choices include: cp1252, "
 "latin1, iso-8859-1 and utf-8."
 msgstr "输入 HTML 文件的字符编码。如常用编码：cp1252, latin1, iso-8859-1 和 utf-8。"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:58
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:59
 msgid ""
 "Create a PMLZ archive containing the PML file and all images in the "
 "directory pmlname_img or images. This plugin is run every time you add a PML "
@@ -193,49 +193,49 @@ msgid ""
 msgstr ""
 "在 pmlname_img 或 images 目录下创建一个包含 PML 文件及所有图像的 PMLZ 归档。此插件在每次向书库添加 PML 文件时运行。"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:90
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:93
 msgid "Extract cover from comic files"
 msgstr "从漫画文件中提取封面"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:117
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:128
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:140
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:150
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:160
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:171
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:181
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:191
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:201
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:211
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:221
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:232
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:243
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:255
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:276
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:287
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:297
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:307
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:120
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:131
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:153
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:163
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:174
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:184
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:194
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:204
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:214
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:224
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:235
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:246
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:258
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:279
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:290
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:300
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:310
 msgid "Read metadata from %s files"
 msgstr "从 %s 文件中读取元数据"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:266
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:269
 msgid "Read metadata from ebooks in RAR archives"
 msgstr "读取 RAR 归档中电子书的元数据"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:318
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:321
 msgid "Read metadata from ebooks in ZIP archives"
 msgstr "读取 ZIP 归档中电子书的元数据"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:331
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:341
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:351
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:373
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:384
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:394
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:334
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:344
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:354
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:376
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:387
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:397
 msgid "Set metadata in %s files"
 msgstr "设置 %s 文件的元数据"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:362
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:365
 msgid "Set metadata from %s files"
 msgstr "从 %s 文件设置元数据"
 
@@ -355,7 +355,7 @@ msgstr "若您希望在电脑和设备上阅读文档，请使用本默认配置
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:257
 msgid ""
 "Intended for the iPad and similar devices with a resolution of 768x1024"
-msgstr ""
+msgstr "适用于iPad或屏幕分辨率为768x1024的类似设备。"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:425
 msgid "This profile is intended for the Kobo Reader."
@@ -379,35 +379,35 @@ msgstr "该配置文件适用 SONY PRS 产品线，如 500/505/700 型号等，
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr "该配置文件适用 Amazon Kindle DX。"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:31
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
 msgid "Installed plugins"
 msgstr "已安装插件"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:33
 msgid "Mapping for filetype plugins"
 msgstr "关联插件文件类型"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:33
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:34
 msgid "Local plugin customization"
 msgstr "本地插件定制"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:34
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
 msgid "Disabled plugins"
 msgstr "禁用插件"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
 msgid "Enabled plugins"
-msgstr ""
+msgstr "启用的插件"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:83
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:84
 msgid "No valid plugin found in "
 msgstr "无有效插件位于 "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:460
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:468
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr "插件 %s 初始化返回失败回溯："
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:493
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
 msgid ""
 "    %prog options\n"
 "\n"
@@ -419,29 +419,29 @@ msgstr ""
 "    通过加载外部插件定制 Calibre。\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:499
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr "添加插件，指定包含其 zip 文件的路径。"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr "按名称移除自定义插件（对内置插件无效）。"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:503
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:511
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
 msgstr "定制插件，指定插件名和自定制字符串，使用逗号分隔。"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:505
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:513
 msgid "List all installed plugins"
 msgstr "列出全部已装插件"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Enable the named plugin"
 msgstr "启用该名称插件"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Disable the named plugin"
 msgstr "禁用该名称插件"
 
@@ -461,16 +461,16 @@ msgstr "与 S60 手机通信。"
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:87
 msgid "Communicate with iTunes/iBooks."
-msgstr ""
+msgstr "与iTunes/iBooks通信"
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:93
 msgid "Apple device detected, launching iTunes, please wait ..."
-msgstr ""
+msgstr "检测到Apple设备，正在启动iTunes，请稍候……"
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:246
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:249
 msgid "Updating device metadata listing..."
-msgstr ""
+msgstr "更新设备元数据列表……"
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:323
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:362
@@ -485,7 +485,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:962
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2836
 msgid "finished"
-msgstr ""
+msgstr "完成"
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:544
 msgid "Use Series as Category in iTunes/iBooks"
@@ -493,7 +493,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:546
 msgid "Cache covers from iTunes/iBooks"
-msgstr ""
+msgstr "缓存来自iTunes/iBooks的封面"
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:558
 msgid ""
@@ -501,12 +501,17 @@ msgid ""
 "Delete using the iBooks app.\n"
 "Click 'Show Details' for a list."
 msgstr ""
+"部分图书在iTunes数据库中不存在。\n"
+"请用iBooks软件删除它们。\n"
+"点击“详细信息”查看列表。"
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:886
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
 msgstr ""
+"无法转换部分封面图像。\n"
+"点击“详细信息”查看列表。"
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2471
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:807
@@ -522,7 +527,7 @@ msgstr "新闻"
 
 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2698
 msgid "Communicate with iTunes."
-msgstr ""
+msgstr "与iTunes通信。"
 
 #: /home/kovid/work/calibre/src/calibre/devices/binatone/driver.py:17
 msgid "Communicate with the Binatone Readme eBook reader."
@@ -548,11 +553,11 @@ msgstr "与 EB600 eBook reader 通信。"
 
 #: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:193
 msgid "Communicate with the Astak Mentor EB600"
-msgstr ""
+msgstr "与Astak Mentor EB600通信"
 
 #: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:216
 msgid "Communicate with the PocketBook 301 reader."
-msgstr ""
+msgstr "与PocketBook 301阅读器通信。"
 
 #: /home/kovid/work/calibre/src/calibre/devices/edge/driver.py:17
 msgid "Entourage Edge"
@@ -568,12 +573,12 @@ msgstr "与 ESlick eBook reader 通信。"
 
 #: /home/kovid/work/calibre/src/calibre/devices/eslick/driver.py:49
 msgid "Communicate with the Sigmatek eBook reader."
-msgstr ""
+msgstr "与Sigmatek eBook阅读器通信。"
 
 #: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:16
 #: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:30
 msgid "Use an arbitrary folder as a device."
-msgstr ""
+msgstr "将指定目录当成设备使用。"
 
 #: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:26
 #: /home/kovid/work/calibre/src/calibre/devices/interface.py:23
@@ -592,7 +597,7 @@ msgstr "与翰林 V5 电子书通信。"
 msgid "Communicate with the BOOX eBook reader."
 msgstr "与 BOOX eBook reader 通信。"
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:121
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:123
 msgid ""
 "Comma separated list of directories to send e-books to on the device. The "
 "first one that exists will be used."
@@ -604,7 +609,7 @@ msgstr "与 Hanvon N520 eBook reader 通信。"
 
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:40
 msgid "Communicate with The Book reader."
-msgstr ""
+msgstr "与The Book阅读器通信。"
 
 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:51
 msgid "Communicate with the SpringDesign Alex eBook reader."
@@ -663,34 +668,34 @@ msgstr "与 Kobo Reader 通信"
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:51
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:54
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:57
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:157
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:159
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:64
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:67
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:70
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:130
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:137
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:160
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:132
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:139
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:162
 msgid "Getting list of books on device..."
 msgstr "从设备中获取书籍列表..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:218
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:258
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:244
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:262
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:219
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:263
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:246
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:264
 msgid "Removing books from device..."
 msgstr "正在从设备中删除书籍..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:262
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:269
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:269
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:274
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:267
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:274
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:271
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:276
 msgid "Removing books from device metadata listing..."
 msgstr "将书籍从设备的元数据列表移除中..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:274
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:308
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:208
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:238
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:313
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:210
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:240
 msgid "Adding books to device metadata listing..."
 msgstr "将书籍添加到设备的元数据列表中..."
 
@@ -704,7 +709,11 @@ msgstr "与  通信"
 
 #: /home/kovid/work/calibre/src/calibre/devices/misc.py:55
 msgid "Communicate with the Sweex MM300"
-msgstr ""
+msgstr "与Sweex MM300通信。"
+
+#: /home/kovid/work/calibre/src/calibre/devices/misc.py:75
+msgid "Communicate with the Pandigital Novel"
+msgstr "与Pandigital Novel通信。"
 
 #: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:17
 msgid "Communicate with the Nokia 770 internet tablet."
@@ -716,7 +725,7 @@ msgstr "与诺基亚 810 网络平板通信."
 
 #: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:74
 msgid "Communicate with the Nokia E52"
-msgstr ""
+msgstr "与Nokia E52通信。"
 
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:20
 msgid "The Nook"
@@ -736,7 +745,7 @@ msgstr "与 Sony PRS-500 eBook reader 通信。"
 
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:22
 msgid "Communicate with all the Sony eBook readers."
-msgstr ""
+msgstr "与Sony电子书阅读器通信。"
 
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61
 msgid ""
@@ -759,11 +768,11 @@ msgstr "与 Teclast K3 通信。"
 
 #: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:37
 msgid "Communicate with the Newsmy reader."
-msgstr ""
+msgstr "与Newsmy阅读器通信。"
 
 #: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:49
 msgid "Communicate with the iPapyrus reader."
-msgstr ""
+msgstr "与iPapyrus阅读器通信。"
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:245
 msgid "Unable to detect the %s disk drive. Try rebooting."
@@ -851,12 +860,12 @@ msgstr "与电子书阅读设备通信。"
 msgid "Get device information..."
 msgstr "获取设备信息..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:188
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:192
 msgid "Transferring books to device..."
 msgstr "传输书籍到设备中..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:305
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:307
 msgid "Sending metadata to device..."
 msgstr "正在传输元数据到设备..."
 
@@ -1495,6 +1504,51 @@ msgstr "正在对电子书籍进行转换..."
 msgid "Creating"
 msgstr "正在创建"
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/__init__.py:18
+msgid "ePub Fixer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/epubcheck.py:18
+msgid "Workaround epubcheck bugs"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/epubcheck.py:22
+msgid ""
+"Workarounds for bugs in the latest release of epubcheck. epubcheck reports "
+"many things as errors that are not actually errors. epub-fix will try to "
+"detect these and replace them with constructs that epubcheck likes. This may "
+"cause significant changes to your epub, complain to the epubcheck project."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:19
+msgid ""
+"%prog [options] file.epub\n"
+"\n"
+"Fix common problems in EPUB files that can cause them to be rejected by "
+"poorly designed publishing services.\n"
+"\n"
+"By default, no fixing is done and messages are printed out for each error "
+"detected. Use the options to control which errors are automatically fixed."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:50
+msgid "You must specify an epub file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:17
+msgid "Fix unmanifested files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:21
+msgid ""
+"Fix unmanifested files. epub-fix can either add them to the manifest or "
+"delete them as specified by the delete unmanifested option."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:32
+msgid "Delete unmanifested files instead of adding them to the manifest"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:56
 msgid ""
 "Extract the contents of the generated EPUB file to the specified directory. "
@@ -1822,11 +1876,11 @@ msgstr "漫画"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:98
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:882
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:887
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:543
 msgid "Title"
 msgstr "标题"
@@ -1835,7 +1889,7 @@ msgstr "标题"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:364
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:883
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:888
 msgid "Author(s)"
 msgstr "作者"
 
@@ -1858,7 +1912,7 @@ msgstr "出品人"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:67
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:318
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1073
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1079
 msgid "Comments"
 msgstr "注释"
 
@@ -1867,7 +1921,7 @@ msgstr "注释"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:306
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1069
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1075
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:139
 msgid "Tags"
 msgstr "标签"
@@ -1877,7 +1931,7 @@ msgstr "标签"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:323
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1084
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:87
 msgid "Series"
 msgstr "系列"
@@ -1887,7 +1941,7 @@ msgid "Language"
 msgstr "语言"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:406
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1067
 msgid "Timestamp"
 msgstr "时间戳"
 
@@ -2131,7 +2185,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1226
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1398
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1399
 msgid "Cover"
 msgstr "封面"
 
@@ -2170,70 +2224,70 @@ msgstr "所有文章"
 msgid "This is an Amazon Topaz book. It cannot be processed."
 msgstr "这是一部 Amazon Topaz 书籍。无法处理。"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1399
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1400
 msgid "Title Page"
 msgstr "标题页"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1400
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1401
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:15
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:53
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:194
 msgid "Table of Contents"
 msgstr "目录"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1401
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1402
 msgid "Index"
 msgstr "索引"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1402
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1403
 msgid "Glossary"
 msgstr "词汇表"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1403
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1404
 msgid "Acknowledgements"
 msgstr "致谢"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1404
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1405
 msgid "Bibliography"
 msgstr "参考文献"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1405
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1406
 msgid "Colophon"
 msgstr "末页"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1406
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1407
 msgid "Copyright"
 msgstr "版权"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1407
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1408
 msgid "Dedication"
 msgstr "献辞"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1408
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1409
 msgid "Epigraph"
 msgstr "题辞"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1409
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1410
 msgid "Foreword"
 msgstr "前言"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1410
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1411
 msgid "List of Illustrations"
 msgstr "插图列表"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1411
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1412
 msgid "List of Tables"
 msgstr "表格列表"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1412
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1413
 msgid "Notes"
 msgstr "注释"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1413
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1414
 msgid "Preface"
 msgstr "序言"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1414
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1415
 msgid "Main Text"
 msgstr "正文"
 
@@ -2277,7 +2331,7 @@ msgstr "侧边栏"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:22
 #: /home/kovid/work/calibre/src/calibre/ebooks/tcr/input.py:23
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:23
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:24
 msgid ""
 "Normally calibre treats blank lines as paragraph markers. With this option "
 "it will assume that every line represents a paragraph instead."
@@ -2285,7 +2339,7 @@ msgstr "一般情况下，Calibre 会将空行识别为段落分隔。而此选
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:26
 #: /home/kovid/work/calibre/src/calibre/ebooks/tcr/input.py:27
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:27
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:28
 msgid ""
 "Normally calibre treats blank lines as paragraph markers. With this option "
 "it will assume that every line starting with an indent (either a tab or 2+ "
@@ -2437,7 +2491,7 @@ msgstr ""
 "获取 PDF 文件信息。\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
 msgid "Author"
 msgstr "作者"
@@ -2596,19 +2650,19 @@ msgid ""
 "slowest."
 msgstr "指定压缩级别。范围 1-10。1 为最低级别，压缩过程最快；10为最高压缩率，但压缩过程更长。"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:33
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:34
 msgid ""
 "Normally extra spaces are condensed into a single space. With this option "
 "all spaces will be displayed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:36
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:37
 msgid ""
 "Run the text input through the markdown pre-processor. To learn more about "
 "markdown see"
 msgstr "用 markdown 预处理运行文本输入。了解更多关于 markdown 信息参见"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:39
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:40
 msgid "Do not insert a Table of Contents into the output text."
 msgstr "输出文本中不插入目录。"
 
@@ -2773,7 +2827,7 @@ msgstr "复制"
 msgid "Copy to Clipboard"
 msgstr "复制到剪贴板"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:400
 msgid "Choose Files"
 msgstr "选择文件"
 
@@ -2788,13 +2842,13 @@ msgid "User annotations generated from main library only"
 msgstr "仅使用主书库生成注释"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:75
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:612
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:671
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:708
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:729
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:877
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1060
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:670
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:707
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:728
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:876
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:941
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1059
 msgid "No books selected"
 msgstr "未选择书籍"
 
@@ -2834,209 +2888,209 @@ msgstr "多少空白书籍？"
 msgid "How many empty books should be added?"
 msgstr "应添加多少空白书籍？"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:340
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:390
 msgid "Uploading books to device."
 msgstr "正在上传书籍到设备。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:350
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:137
 msgid "Books"
 msgstr "书籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
 msgid "EPUB Books"
 msgstr "EPUB 书籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
 msgid "LRF Books"
 msgstr "LRF 书籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
 msgid "HTML Books"
 msgstr "HTML 书籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
 msgid "LIT Books"
 msgstr "LIT 书籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
 msgid "MOBI Books"
 msgstr "MOBI 书籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
 msgid "Topaz books"
 msgstr "Topaz 书籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
 msgid "Text books"
 msgstr "文本书籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:359
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
 msgid "PDF Books"
 msgstr "PDF 书籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:359
 msgid "Comics"
 msgstr "漫画"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:360
 msgid "Archives"
 msgstr "归档"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:364
 msgid "Supported books"
 msgstr "支持的书j"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:399
 msgid "Merged some books"
 msgstr "合并一些书籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:401
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:400
 msgid ""
 "Some duplicates were found and merged into the following existing books:"
 msgstr "找到一些重复内容，并入如下已有书籍："
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:409
 msgid "Failed to read metadata"
 msgstr "无法读取元数据"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:410
 msgid "Failed to read metadata from the following"
 msgstr "无法从下列项目读取元数据"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:434
 msgid "Add to library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:460
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1229
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:459
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1228
 msgid "No book selected"
 msgstr "未选择书籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:434
 msgid "No book files found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:456
 msgid "Cannot delete"
 msgstr "无法删除"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:469
 msgid "Choose formats to be deleted"
 msgstr "选择删除格式"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:488
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:487
 msgid "Choose formats <b>not</b> to be deleted"
 msgstr "选择<b>非</b>删除格式"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:507
 msgid "Cannot delete books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:509
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:508
 msgid "No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:519
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:518
 msgid "Main memory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:520
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:444
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:453
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:519
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:454
 msgid "Storage Card A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:521
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:446
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:455
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:447
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:456
 msgid "Storage Card B"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:525
 msgid "No books to delete"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:526
 msgid "None of the selected books are on the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:544
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:600
 msgid "Deleting books from device."
 msgstr "从设备删除书籍。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:564
 msgid ""
 "The selected books will be <b>permanently deleted</b> and the files removed "
 "from your computer. Are you sure?"
 msgstr "选定书籍将被<b>永久删除</b>，文件会从您的电脑中移除。是否确定？"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:585
 msgid ""
 "The selected books will be <b>permanently deleted</b> from your device. Are "
 "you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:610
 msgid "Cannot download metadata"
 msgstr "无法下载元数据"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:627
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
 msgid "social metadata"
 msgstr "社会性元数据"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
 msgid "covers"
 msgstr "封面"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
 msgid "metadata"
 msgstr "元数据"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:630
 msgid "Downloading %s for %d book(s)"
 msgstr "正在为 %s 本书下载 %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:654
 msgid "Failed to download some metadata"
 msgstr "下载一些元数据失败"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:656
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
 msgid "Failed to download metadata for the following:"
 msgstr "下载下列书籍元数据失败："
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:659
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:658
 msgid "Failed to download metadata:"
 msgstr "下载元数据失败。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:660
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:637
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:522
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:949
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:659
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:638
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:951
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
 msgid "Error"
 msgstr "错误"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:670
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:707
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:669
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:706
 msgid "Cannot edit metadata"
 msgstr "无法编辑元数据"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:728
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:731
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:727
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:730
 msgid "Cannot merge books"
 msgstr "无法合并书籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:732
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:731
 msgid "At least two books must be selected for merging"
 msgstr "合并需要选定至少两本书籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:736
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:735
 msgid ""
 "All book formats and metadata from the selected books will be added to the "
 "<b>first selected book.</b><br><br> The second and subsequently selected "
@@ -3044,7 +3098,7 @@ msgid ""
 "proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:747
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:746
 msgid ""
 "All book formats and metadata from the selected books will be merged into "
 "the <b>first selected book</b>.<br><br>After merger the second and "
@@ -3054,51 +3108,51 @@ msgid ""
 "from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:759
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:758
 msgid ""
 "You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
 "proceed?"
 msgstr "您将要合并多余 5 本书。<b>是否</b>确定？"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:876
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:875
 msgid "Cannot save to disk"
 msgstr "无法保存到磁盘"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:878
 msgid "Choose destination directory"
 msgstr "选择目标目录"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:912
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:911
 msgid "Error while saving"
 msgstr "保存出错"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:913
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:912
 msgid "There was an error while saving."
 msgstr "保存时出错。"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:919
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:920
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:921
 msgid "Could not save some books"
 msgstr "无法保存一些书籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:922
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:921
 msgid "Click the show details button to see which ones."
 msgstr "点击显示详情按钮查看具体哪些。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
 msgid "No books selected to generate catalog for"
 msgstr "未选定书籍生成类目"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:960
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:959
 msgid "Generating %s catalog..."
 msgstr "正在生成 %s 类目..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:965
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:964
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:264
 msgid "No books found"
 msgstr "未找到书籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:966
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:965
 msgid ""
 "No books to catalog\n"
 "Check exclude tags"
@@ -3106,49 +3160,49 @@ msgstr ""
 "没有书籍收入类目\n"
 "检查不含标签"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:976
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:975
 msgid "Catalog generated."
 msgstr "已经生成类目。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:979
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:978
 msgid "Export Catalog Directory"
 msgstr "输出类目目录"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:980
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:979
 msgid "Select destination for %s.%s"
 msgstr "选定目标位置 %s.%s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:996
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:995
 msgid "Fetching news from "
 msgstr "正在抓取新闻，来源于 "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1009
 msgid " fetched."
 msgstr " 已抓取。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1059
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1058
 msgid "Cannot convert"
 msgstr "无法转换"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1088
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1087
 msgid "Starting conversion of %d book(s)"
 msgstr "开始转换 %d 本书"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1265
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1264
 msgid "Cannot view"
 msgstr "无法查看"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1209
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
 msgid "Choose the format to view"
 msgstr "选择格式进行查看"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1218
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1217
 msgid "Multiple Books Selected"
 msgstr "选定多本书籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1219
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1218
 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 "
@@ -3156,11 +3210,11 @@ msgid ""
 "continue?"
 msgstr "您正在试图打开 %d 本书籍。同时打开太多书籍可能会变慢，并对电脑响应速度有消极影响。一旦开始，需等待进程完成。是否继续？"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1227
 msgid "Cannot open folder"
 msgstr "无法打开文件夹"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1266
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1265
 msgid "%s has no available formats."
 msgstr "%s 无可用格式。"
 
@@ -3185,7 +3239,7 @@ msgid "The specified directory could not be processed."
 msgstr "无法处理指定目录。"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:845
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "No books"
 msgstr "没有书籍"
 
@@ -3309,15 +3363,15 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:52
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:633
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:637
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:366
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:371
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:385
@@ -3341,12 +3395,12 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:259
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:265
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:149
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:186
@@ -3376,8 +3430,9 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:313
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1059
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1065
 msgid "Path"
 msgstr "路径"
 
@@ -3394,8 +3449,8 @@ msgid "Formats"
 msgstr "格式"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:25
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:886
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1062
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:891
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1068
 msgid "Collections"
 msgstr ""
 
@@ -3408,12 +3463,12 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:305
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:311
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:317
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1068
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1072
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1074
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:458
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:274
 msgid "None"
 msgstr "无"
 
@@ -4261,12 +4316,12 @@ msgid "Footer regular expression:"
 msgstr "页脚正则表达式："
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:56
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:77
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:76
 msgid "Invalid regular expression"
 msgstr "无效正则表达式"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:77
 msgid "Invalid regular expression: %s"
 msgstr "无效正则表达式：%s"
 
@@ -4482,11 +4537,11 @@ msgstr ""
 "高级用法参见 <a href=\"http://calibre-ebook.com/user_manual/xpath.html\">XPath "
 "教程</a>。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:127
 msgid "Cover browser could not be loaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:179
 msgid "Browse by covers"
 msgstr "用封面浏览"
 
@@ -4545,245 +4600,241 @@ msgstr ""
 msgid "tags to remove"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:49
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:135
 msgid "No details available."
 msgstr "无详情可用。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:155
 msgid "Device no longer connected."
 msgstr "设备未连接。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:270
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:271
 msgid "Get device information"
 msgstr "获取设备信息"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:282
 msgid "Get list of books on device"
 msgstr "获取设备书籍列表"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:292
 msgid "Get annotations from device"
 msgstr "从设备抓取注释"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:301
 msgid "Send metadata to device"
 msgstr "传输元数据到设备上"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:305
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:306
 msgid "Send collections to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:330
 msgid "Upload %d books to device"
 msgstr "上传 %d 本书到设备"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:344
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:345
 msgid "Delete books from device"
 msgstr "从设备上删除书籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:362
 msgid "Download books from device"
 msgstr "从设备上下载书籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:372
 msgid "View book on device"
 msgstr "查看设备上的书籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:408
 msgid "Set default send to device action"
 msgstr "设置传送到设备的默认动作"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:413
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:420
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:422
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:414
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:425
 msgid "Email to"
 msgstr "发送邮件至"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:424
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:425
 msgid " and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:434
 msgid "Send to main memory"
 msgstr "传送到主内存"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:436
 msgid "Send to storage card A"
 msgstr "发送到存储卡 A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:437
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:438
 msgid "Send to storage card B"
 msgstr "发送到存储卡 B"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:442
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:451
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:443
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:452
 msgid "Main Memory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:469
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:470
 msgid "Send and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:471
 msgid "Send specific format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:509
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:510
 msgid "Connect to folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:516
 msgid "Connect to iTunes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:521
 msgid "Eject device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:529
 msgid "Fetch annotations (experimental)"
 msgstr "抓取注释（实验功能）"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:638
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:639
 msgid "Error communicating with device"
 msgstr "与设备通信发生错误"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:659
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:660
 msgid "Select folder to open as device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:704
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:705
 msgid "Failed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:710
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:711
 msgid "Error talking to device"
 msgstr "设备通讯错误。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:711
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:712
 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/device.py:753
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:754
 msgid "Device: "
 msgstr "设备： "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:755
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:756
 msgid " detected."
 msgstr " 被检测到。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:778
-msgid "Connected "
-msgstr "已连接 "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:846
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842
 msgid "selected to send"
 msgstr "选择传送"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:851
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:847
 msgid "Choose format to send to device"
 msgstr "选择传送到设备的格式"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:860
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:856
 msgid "No device"
 msgstr "无设备"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:857
 msgid "Cannot send: No device is connected"
 msgstr "无法传送：无连接设备"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:860
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:868
 msgid "No card"
 msgstr "无卡"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:869
 msgid "Cannot send: Device has no storage card"
 msgstr "无法传送：设备中无储存卡"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:910
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:906
 msgid "E-book:"
 msgstr "电子书："
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:913
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:909
 msgid "Attached, you will find the e-book"
 msgstr "已添加, 您可以从中获取电子书籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:910
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:181
 msgid "by"
 msgstr "由"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:915
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:911
 msgid "in the %s format."
 msgstr "使用 %s 格式."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:928
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:924
 msgid "Sending email to"
 msgstr "正在发送邮件至"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:958
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:965
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1057
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1118
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1236
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:954
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:962
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1054
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1235
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:1243
 msgid "No suitable formats"
 msgstr "无合适格式"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:959
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:955
 msgid "Auto convert the following books before sending via email?"
 msgstr "在发送电子邮件之前自动转换下列书籍？"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:966
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:963
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr "由于无法找到合适的文件格式无法通过电子邮件发送下列书籍:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:984
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:981
 msgid "Failed to email books"
 msgstr "发送电子书籍失败"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:985
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:982
 msgid "Failed to email the following books:"
 msgstr "无法通过电子邮件发送以下书籍:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:989
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:986
 msgid "Sent by email:"
 msgstr "已通过邮件发送:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1016
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1013
 msgid "News:"
 msgstr "新闻:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1017
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1014
 msgid "Attached is the"
 msgstr "附加"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1028
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1025
 msgid "Sent news to"
 msgstr "将新闻发送到"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1058
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1237
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1055
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1117
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1236
 msgid "Auto convert the following books before uploading to the device?"
 msgstr "上传到设备之前自动转换如下书籍？"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1087
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1085
 msgid "Sending catalogs to device."
 msgstr "正在发送类目到设备。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1150
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1149
 msgid "Sending news to device."
 msgstr "将新闻传送到设备."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1202
 msgid "Sending books to device."
 msgstr "传送书籍到设备。"
 
@@ -4835,7 +4886,7 @@ msgid "My Books"
 msgstr "我的书籍"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:69
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:289
 msgid "Generate catalog"
 msgstr "生成类目"
 
@@ -4974,157 +5025,157 @@ msgstr ""
 msgid "Narrow"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:503
 msgid "System port selected"
 msgstr "系统端口选定"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:503
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:504
 msgid ""
 "The value <b>%d</b> you have chosen for the content server port is a system "
 "port. Your operating system <b>may</b> not allow the server to run on this "
 "port. To be safe choose a port number larger than 1024."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:524
 msgid "Failed to install command line tools."
 msgstr "安装命令行工具失败。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:527
 msgid "Command line tools installed"
 msgstr "命令行工具已安装"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:528
 msgid "Command line tools installed in"
 msgstr "命令行工具安装于"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:529
 msgid ""
 "If you move calibre.app, you have to re-install the command line tools."
 msgstr "如果您移动 calibre.app，您必须重新安装命令行工具。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:580
 msgid "No valid plugin path"
 msgstr "不合法的插件路径"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:581
 msgid "%s is not a valid plugin path"
 msgstr "%s 不是合法的插件路径"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:584
 msgid "Choose plugin"
 msgstr "选择插件"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:596
 msgid "Plugin cannot be disabled"
 msgstr "该插件不能被禁用"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:597
 msgid "The plugin: %s cannot be disabled"
 msgstr "插件: %s 不能被禁用"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:606
 msgid "Plugin not customizable"
 msgstr "无法个性化插件"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:607
 msgid "Plugin: %s does not need customization"
 msgstr "插件: %s 无需个性化设置"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:615
 msgid "Customize"
 msgstr "定制"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:652
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:653
 msgid "Cannot remove builtin plugin"
 msgstr "不能移除内置插件"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:653
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:654
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr " 无法移除. 该插件是内置插件. 您可以尝试禁用它而非移除."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:684
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:685
 msgid "You must select a column to delete it"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:690
 msgid "The selected column is not a custom column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:690
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:691
 #: /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/config/__init__.py:691
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:692
 msgid "Do you really want to delete column %s and all its data?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:758
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:759
 msgid "Error log:"
 msgstr "错误日志:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:765
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:766
 msgid "Access log:"
 msgstr "访问日志:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:793
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:794
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:331
 msgid "Failed to start content server"
 msgstr "无法启动内容服务器"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:817
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:818
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:587
 msgid "Select location for books"
 msgstr "选择书籍位置"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:824
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:825
 msgid "Invalid size"
 msgstr "无效的尺寸"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:825
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:826
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr "尺寸大小 %s 不合法. 合法的格式为 宽度x高度"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:884
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:889
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:891
 msgid "Invalid database location"
 msgstr "不合法的数据库路径"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:885
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:887
 msgid "Invalid database location "
 msgstr "不合法的数据库路径 "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:888
 msgid "<br>Must be a directory."
 msgstr "<br>必须是文件目录."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:890
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:892
 msgid "Invalid database location.<br>Cannot write to "
 msgstr "不合法的数据库路径.<br>无法写入到 "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:895
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:897
 msgid "Must restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:896
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:898
 msgid ""
 "The changes you made require that Calibre be restarted. Please restart as "
 "soon as practical."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:930
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:932
 msgid "Checking database integrity"
 msgstr "检查数据库完整性"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:950
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:952
 msgid "Failed to check database integrity"
 msgstr "检查数据库完整性失败"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:957
 msgid "Some inconsistencies found"
 msgstr "找到部分不一致"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:956
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:958
 msgid ""
 "The following books had formats listed in the database that are not actually "
 "available. The entries for the formats have been removed. You should check "
@@ -5132,32 +5183,32 @@ msgid ""
 "folder directly."
 msgstr "下列书籍使用格式曾经在数据库中，现已不可用。格式项被移除。您需手动检查。这可能是由于您直接在 library 文件夹操作文件引起的。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:133
 msgid "TabWidget"
 msgstr "标签Widget"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:114
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:134
 msgid ""
 "Here you can control how calibre will read metadata from the files you add "
 "to it. calibre can either read metadata from the contents of the file, or "
 "from the filename."
 msgstr "在此处您可以控制 Calibre 如何从您添加的文件读取元数据。Calibre 可从文件内容读取元数据，也可以从文件名读取。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:135
 msgid "Read metadata only from &file name"
 msgstr "从文件名读取元数据(&F)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:136
 msgid ""
 "Swap the firstname and lastname of the author. This affects only metadata "
 "read from file names."
 msgstr "对调作者姓和名。仅影响来自文件名的元数据。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:137
 msgid "&Swap author firstname and lastname"
 msgstr "交换作者姓和名(&S)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:138
 msgid ""
 "If an existing book with a similar title and author is found that does not "
 "have the format being added, the format is added\n"
@@ -5168,380 +5219,395 @@ msgid ""
 "punctuation, case, etc. Author match is exact."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:142
 msgid ""
 "If books with similar titles and authors found, &merge the new files "
 "automatically"
 msgstr "如果找到相似标题和作者的书籍，自动合并新文件(&m)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:143
 msgid "&Configure metadata from file name"
 msgstr "从文件名配置元数据(&C)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:144
 msgid "&Adding books"
 msgstr "添加书籍(&A)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:145
 msgid ""
 "Here you can control how calibre will save your books when you click the "
 "Save to Disk button:"
 msgstr "此处您可控制 Calibre 在您点击“保存到磁盘”时的保存行为："
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:146
 msgid "Save &cover separately"
 msgstr "分别保存封面(&C)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:147
 msgid "Update &metadata in saved copies"
 msgstr "更新保存版本的元数据(&M)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:148
 msgid "Save metadata in &OPF file"
 msgstr "使用 OPF 文件保存元数据(&O)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:149
 msgid "Convert non-English characters to &English equivalents"
 msgstr "将非英语字符转换为对应英语字符"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:150
 msgid "Format &dates as:"
 msgstr "日期格式为(&D)："
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:151
 msgid "File &formats to save:"
 msgstr "保存文件格式为(&F)："
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:152
 msgid "Replace space with &underscores"
 msgstr "用下划线替换空格(&U)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:153
 msgid "Change paths to &lowercase"
 msgstr "将路径名改为小写(&L)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:154
 msgid "&Saving books"
 msgstr "保存书籍(&S)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:135
-msgid "Preserve device collections."
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:155
+msgid "Metadata &management:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:156
+msgid "Manual management"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:157
+msgid "Only on send"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:158
+msgid "Automatic management"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:159
 msgid ""
-"If checked, collections will not be deleted even if a book with changed "
-"metadata is resent and the collection is not in the book's metadata. In "
-"addition, editing collections in the device view will be enabled. If "
-"unchecked, collections will be always reflect only the metadata in the "
-"calibre library."
+"<li><b>Manual Management</b>: Calibre updates the metadata and adds "
+"collections only when a book is sent. With this option, calibre will never "
+"remove a collection.</li>\n"
+"<li><b>Only on send</b>: Calibre updates metadata and adds/removes "
+"collections for a book only when it is sent to the device. </li>\n"
+"<li><b>Automatic management</b>: Calibre automatically keeps metadata on the "
+"device in sync with the calibre library, on every connect</li></ul>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:137
-msgid "  "
-msgstr "  "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:162
 msgid ""
 "Here you can control how calibre will save your books when you click the "
 "Send to Device button. This setting can be overriden for individual devices "
 "by customizing the device interface plugins in Preferences->Plugins"
 msgstr "在此控制 calibre 发送到设备时的存储方式。首选项 -> 插件 中定义单个设备接口插件可以覆盖此处设置。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/add_save_ui.py:163
 msgid "Sending to &device"
 msgstr "发送到设备(&D)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:167
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:174
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr "首选项"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
 msgstr "电子书位置(&L)（电子书籍按作者排序存储在文件目录中，元数据存储在 metadata.db）"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
 msgid "Browse for the new database location"
 msgstr "选择新的数据库路径"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
 msgid "Show notification when &new version is available"
 msgstr "新版程序可用时提示(&N)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
 msgid "Download &social metadata (tags/ratings/etc.) by default"
 msgstr "默认下载社会性元数据（标签、评分等）(&S)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
 msgid "&Overwrite author and title by default when fetching metadata"
 msgstr "默认抓取元数据覆盖作者和标题(&O)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
 msgid "Default network &timeout:"
 msgstr "默认网络超时(&t)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
 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/config_ui.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
 msgid " seconds"
 msgstr " 秒"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
 msgid "Choose &language (requires restart):"
 msgstr "选择界面语言, 需重启(&l):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
 msgid "Normal"
 msgstr "普通"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
 msgid "High"
 msgstr "高"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
 msgid "Low"
 msgstr "低"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
 msgid "Job &priority:"
 msgstr "进程优先级(&p):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
 msgid "Preferred &output format:"
 msgstr "首选输出格式(&O)："
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
 msgid "Preferred &input format order:"
 msgstr "首选输入格式顺序(&I)："
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
 msgid "Use &Roman numerals for series number"
 msgstr "使用罗马数字作为序列数(&R)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
 msgid "Enable system &tray icon (needs restart)"
 msgstr "显示系统托盘图标, 需重启生效(&t)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
 msgid "Show &notifications in system tray"
 msgstr "在系统托盘除显示和提醒"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr "在单独的窗口显示封面浏览界面, 需重启生效(&b)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
 msgid "Show &average ratings in the tags browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
 msgid "Search as you type"
 msgstr "即时搜索"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr "自动将下载的新闻传输到电子书阅读器上(&n)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
 msgid "&Delete news from library when it is automatically sent to reader"
 msgstr "在将新闻传送到设备上后从书库中删除(&D)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr "浏览模式下显示的书籍封面数量(&N), 须重启生效;"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
 msgid "Toolbar"
 msgstr "工具栏"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
 msgid "Large"
 msgstr "大"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
 msgid "Medium"
 msgstr "中"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
 msgid "Small"
 msgstr "小"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
 msgid "&Button size in toolbar"
 msgstr "工具栏按钮大小(&B)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
 msgid "Show &text in toolbar buttons"
 msgstr "在工具栏显示按钮文字(&t)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
 msgid "Select visible &columns in library view"
 msgstr "选择在书库界面中显示的新系列(&c)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
 msgid "Remove a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
 msgid "Add a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
 msgid "Edit settings of a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
 msgid "Use internal &viewer for:"
 msgstr "使用内部浏览器显示"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
 msgid "User Interface &layout (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
 msgid "Disable &animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
+msgid "Show &donate button (restart)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
 msgid "Add an email address to which to send books"
 msgstr "将电子邮件地址添加到书籍发送目的"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
 msgid "&Add email"
 msgstr "添加邮件地址(&A)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
 msgid "Make &default"
 msgstr "设为默认(&d)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
 msgid "&Remove email"
 msgstr "删除邮件地址(&R)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
 msgid ""
 "calibre can send your books to you (or your reader) by email. Emails will be "
 "automatically sent for downloaded news to all email addresses that have Auto-"
 "send checked."
 msgstr "calibre 可以将您的书籍用电子邮件发送给你（或您的读者）。电子邮件将自动向所有钩选自动发送的地址发送下载新闻。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
 msgid "&Maximum number of waiting worker processes (needs restart):"
 msgstr "等待中的工作进程最大值（需要重启）(&M)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
 msgid "&Check database integrity"
 msgstr "检查数据库完整性(&C)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
 msgid "&Install command line tools"
 msgstr "安装命令行工具(&I)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
 msgid "Open calibre &configuration directory"
 msgstr "打开 calibre 配置目录(&C)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
 msgid "Limit the max. simultaneous jobs to the available CPU &cores"
 msgstr "显示最大并发任务数为可用 CPU 核心数(&C)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
 msgid "Debug &device detection"
 msgstr "调试设备检测(&D)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
 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/config_ui.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
 msgid "Server &port:"
 msgstr "服务器端口(&p):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:212
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:117
 msgid "&Username:"
 msgstr "用户名(&U):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:213
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:119
 msgid "&Password:"
 msgstr "密码(&P):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
 msgstr "如果您使用空密码将导致其他人可以从web界面访问您的书籍库."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
 msgstr "显示书籍封面的最大尺寸(宽度x高度). 过大的封面将会被相应缩小. "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
 msgid "Max. &cover size:"
 msgstr "最大封面大小(&c):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:621
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:214
 msgid "&Show password"
 msgstr "显示密码(&S)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
 msgid "Max. &OPDS items per query:"
 msgstr "每次请求最大 OPDS 项(&O)："
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
 msgid "Max. OPDS &ungrouped items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
 msgid "&Start Server"
 msgstr "启动服务器(&S)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:621
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
 msgid "St&op Server"
 msgstr "停止服务器(&o)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:626
 msgid "&Test Server"
 msgstr "测试服务器(&T)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
 msgid "Run server &automatically on startup"
 msgstr "在系统启动时自动启动服务器(&a)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:628
 msgid "View &server logs"
 msgstr "查看服务器日志(&s)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:46
 msgid ""
 "<p>Remember to leave calibre running as the server only runs as long as "
@@ -5556,33 +5622,33 @@ msgstr ""
 "http://myhostname:8080 作为新类目。此时 myhostname 应该为有效主机名，或者您 Calibre 程序所运行计算机的 IP "
 "地址。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:631
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
 msgstr "从可以通过配置插件的启用与否来调整Calibre的功能特性."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:628
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:632
 msgid "Enable/&Disable plugin"
 msgstr "启用/禁用插件(&D)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:633
 msgid "&Customize plugin"
 msgstr "定制插件(&C)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:630
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:634
 msgid "&Remove plugin"
 msgstr "移除插件(&R)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:635
 msgid "Add new plugin"
 msgstr "添加插件"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:632
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:636
 msgid "Plugin &file:"
 msgstr "插件文件(&F)："
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:634
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:638
 msgid "&Add"
 msgstr "添加(&A)"
 
@@ -5620,9 +5686,9 @@ msgstr "数字"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:31
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:884
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:889
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Date"
 msgstr "日期"
@@ -5816,12 +5882,18 @@ msgstr "一直显示此警告信息(&S)"
 msgid "ERROR"
 msgstr "错误"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:67
+msgid ""
+"All checked books will be <b>permanently deleted</b> from your device. "
+"Please verify the list."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 msgid "Location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1058
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1064
 msgid "Format"
 msgstr "格式"
 
@@ -6626,6 +6698,10 @@ msgstr "若您想添加的标签不在可用标签列表中，请在此添加。
 msgid "Add tag to available tags and apply it to current book"
 msgstr "将标签添加到可用列表并应用到当前书籍"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:20
+msgid "%s (was %s)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:501
 msgid "Item is blank"
@@ -6944,11 +7020,11 @@ msgstr "正则表达式 (?P&lt;title&gt;)"
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:84
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:88
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:93
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:98
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:100
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:99
 msgid "No match"
 msgstr "无匹配"
 
@@ -6988,146 +7064,164 @@ msgstr "正则表达式 (?P<isbn>)"
 msgid "Save single format to disk..."
 msgstr "将单格式存入磁盘"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:53
 msgid "Edit metadata individually"
 msgstr "逐个修改元数据"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:56
 msgid "Edit metadata in bulk"
 msgstr "批量修改元数据"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:59
 msgid "Download metadata and covers"
 msgstr "下载元数据和封面"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:62
 msgid "Download only metadata"
 msgstr "仅下载元数据"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:64
 msgid "Download only covers"
 msgstr "仅下载封面"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:67
 msgid "Download only social metadata"
 msgstr "仅下载社会性元数据"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:73
 msgid "Merge into first selected book - delete others"
 msgstr "合并到第一本选定书籍 - 删除其它"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:76
 msgid "Merge into first selected book - keep others"
 msgstr "合并到第一本选定书籍 - 保留其它"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:84
 msgid "Add books from a single directory"
 msgstr "从单个目录添加书籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:86
 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/init.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:90
 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/init.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:93
 msgid "Add Empty book. (Book entry with no formats)"
 msgstr "添加空书。（无任何格式）"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:102
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:160
 msgid "Save to disk"
 msgstr "保存到磁盘"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Save to disk in a single directory"
 msgstr "保存到磁盘单个目录"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:106
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:402
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:393
 msgid "Save only %s format to disk"
 msgstr "仅保存 %s 到磁盘"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:110
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:396
 msgid "Save only %s format to disk in a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:119
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:166
 msgid "View"
 msgstr "查看"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:121
 msgid "View specific format"
 msgstr "查看特定格式"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:127
 msgid "Remove selected books"
 msgstr "移除选定书籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:129
 msgid "Remove files of a specific format from selected books.."
 msgstr "移除选定书籍中指定格式的书..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:132
 msgid "Remove all formats from selected books, except..."
 msgstr "移除所有格式选定书籍，除..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:135
 msgid "Remove covers from selected books"
 msgstr "移除选定书籍封面"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:138
 msgid "Remove matching books from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:155
 msgid "Convert individually"
 msgstr "分别转换"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:157
 msgid "Bulk convert"
 msgstr "批量转换"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:161
 msgid "Create catalog of books in your calibre library"
 msgstr "在您 calibre 书库中创建书籍类目"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:169
 msgid "Run welcome wizard"
 msgstr "运行欢迎向导"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:191
 msgid "Similar books..."
 msgstr "类似书籍..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:223
 msgid "Add books to library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:234
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:241
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:225
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:239
 msgid "Manage collections"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:328
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:319
 msgid "Cover Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:337
 msgid "Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:358
+msgid "version"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:359
+msgid "created by Kovid Goyal"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:377
+msgid "Connected "
+msgstr "已连接 "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:386
+msgid "Update found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:430
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:439
 msgid "Book Details"
 msgstr ""
 
@@ -7190,6 +7284,218 @@ msgstr "点击查看活动任务。"
 msgid " - Jobs"
 msgstr " - 任务"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:64
+msgid ""
+"Library\n"
+"%d books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:65
+msgid ""
+"Reader\n"
+"%s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:66
+msgid ""
+"Card A\n"
+"%s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:67
+msgid ""
+"Card B\n"
+"%s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:71
+msgid "Click to see the books available on your computer"
+msgstr "点击查看电脑上可用书籍"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:74
+msgid "Click to see the books in the main memory of your reader"
+msgstr "点击查看阅读区主存储中的书籍"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:75
+msgid "Click to see the books on storage card A in your reader"
+msgstr "点击查看阅读器存储卡 A 中的书籍"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:76
+msgid "Click to see the books on storage card B in your reader"
+msgstr "点击查看阅读器存储卡 B 中的书籍"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:84
+msgid "Books located at"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:100
+msgid "free"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:134
+msgid ""
+"Books display will be restricted to those matching the selected saved search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:136
+msgid "Advanced search"
+msgstr "高级搜索"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:309
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:141
+msgid ""
+"<p>Search the list of books by title, author, publisher, tags, comments, "
+"etc.<br><br>Words separated by spaces are ANDed"
+msgstr "<p>用标题、作者、出版商、标签、注释等搜索书籍列表<br><br>空格间隔关键词视为且(AND)关系"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:316
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:142
+msgid "Reset Quick Search"
+msgstr "重置快速搜索"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:328
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:144
+msgid "Copy current search text (instead of search name)"
+msgstr "当前搜索文本（取代搜索名称）"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:334
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:146
+msgid "Save current search under the name shown in the box"
+msgstr "以框中名称保存当前搜索"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:148
+msgid "Delete current saved search"
+msgstr "删除当前已存搜索"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:150
+msgid "Add books"
+msgstr "添加书籍"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:151
+msgid "A"
+msgstr "A"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:153
+msgid "Remove books"
+msgstr "移除书籍"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:154
+msgid "Del"
+msgstr "Del"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:406
+msgid "Edit meta info"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:406
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:156
+msgid "E"
+msgstr "E"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:157
+msgid "Merge book records"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:407
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:158
+msgid "M"
+msgstr "M"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:159
+msgid "Send to device"
+msgstr "发送到设备"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:161
+msgid "S"
+msgstr "S"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:162
+msgid "Fetch news"
+msgstr "抓取新闻"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:163
+msgid "F"
+msgstr "F"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:164
+msgid "Convert books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:165
+msgid "C"
+msgstr "C"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:412
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:167
+msgid "V"
+msgstr "V"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:413
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:168
+msgid "Open containing folder"
+msgstr "打开包含目录"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:415
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:169
+msgid "Show book details"
+msgstr "显示书籍详情"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:417
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:170
+msgid "Books by same author"
+msgstr "同作者的书籍"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:171
+msgid "Books in this series"
+msgstr "同系列的书籍"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:421
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:172
+msgid "Books by this publisher"
+msgstr "同出版商的书籍"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:423
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:173
+msgid "Books with the same tags"
+msgstr "同标签的书籍"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:425
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:176
+msgid "Ctrl+P"
+msgstr "Ctrl+P"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:177
+msgid "Help"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:178
+msgid "Browse the calibre User Manual"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:179
+msgid "F1"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:284
 msgid "N"
 msgstr ""
@@ -7211,29 +7517,29 @@ msgid "Rating"
 msgstr "评分"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:324
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1084
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr "书籍 <font face=\"serif\">%s</font> 中 %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:674
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1176
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1182
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:886
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:885
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:890
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1156
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1162
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1165
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr "双击<b>编辑</b>该项<br><br>"
 
@@ -7277,11 +7583,11 @@ msgstr ""
 msgid "Restore default layout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:524
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:525
 msgid "Not allowed"
 msgstr "不允许"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:526
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
@@ -7478,155 +7784,34 @@ msgstr "尝试重启电脑。"
 msgid "try deleting the file"
 msgstr "尝试删除文件"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:131
 msgid "calibre"
 msgstr "Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:133
 msgid "&Restrict to:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
-msgid ""
-"Books display will be restricted to those matching the selected saved search"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:135
 msgid "set in ui.py"
 msgstr "在 ui.py 中设定"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
-msgid "Advanced search"
-msgstr "高级搜索"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:138
 msgid "Alt+S"
 msgstr "Alt+S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:139
 msgid "&Search:"
 msgstr "搜索(&S)："
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
-msgid ""
-"<p>Search the list of books by title, author, publisher, tags, comments, "
-"etc.<br><br>Words separated by spaces are ANDed"
-msgstr "<p>用标题、作者、出版商、标签、注释等搜索书籍列表<br><br>空格间隔关键词视为且(AND)关系"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
-msgid "Reset Quick Search"
-msgstr "重置快速搜索"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
-msgid "Choose saved search or enter name for new saved search"
-msgstr "选择已存搜索或输入新存入搜索名称"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
-msgid "Copy current search text (instead of search name)"
-msgstr "当前搜索文本（取代搜索名称）"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
-msgid "Save current search under the name shown in the box"
-msgstr "以框中名称保存当前搜索"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
-msgid "Delete current saved search"
-msgstr "删除当前已存搜索"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
-msgid "Add books"
-msgstr "添加书籍"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
-msgid "A"
-msgstr "A"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
-msgid "Remove books"
-msgstr "移除书籍"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
-msgid "Del"
-msgstr "Del"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:155
 msgid "Edit meta information"
 msgstr "编辑元数据"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
-msgid "E"
-msgstr "E"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
-msgid "Merge book records"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
-msgid "M"
-msgstr "M"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
-msgid "Send to device"
-msgstr "发送到设备"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
-msgid "S"
-msgstr "S"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
-msgid "Fetch news"
-msgstr "抓取新闻"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
-msgid "F"
-msgstr "F"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
-msgid "Convert E-books"
-msgstr "转换电子书"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
-msgid "C"
-msgstr "C"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
-msgid "V"
-msgstr "V"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
-msgid "Open containing folder"
-msgstr "打开包含目录"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
-msgid "Show book details"
-msgstr "显示书籍详情"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
-msgid "Books by same author"
-msgstr "同作者的书籍"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
-msgid "Books in this series"
-msgstr "同系列的书籍"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
-msgid "Books by this publisher"
-msgstr "同出版商的书籍"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
-msgid "Books with the same tags"
-msgstr "同标签的书籍"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:175
 msgid "Configure calibre"
 msgstr "配置 Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
-msgid "Ctrl+P"
-msgstr "Ctrl+P"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:20
 msgid ""
 "Redirect console output to a dialog window (both stdout and stderr). Useful "
@@ -7653,32 +7838,41 @@ msgstr "书籍既没有标题也没有 ISBN 编号"
 msgid "No matches found for this book"
 msgstr "未找到匹配此书信息"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:91
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:262
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:553
 msgid "Search"
 msgstr "搜索"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:313
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:315
 msgid "The selected search will be <b>permanently deleted</b>. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:357
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr "搜索（点击左侧按钮进行高级搜索）"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:392
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:398
 msgid "Saved Searches"
 msgstr "已存搜索"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:406
+msgid "Choose saved search or enter name for new saved search"
+msgstr "选择已存搜索或输入新存入搜索名称"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:10
+msgid "Restrict to"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:48
 msgid "({0} of {1})"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
 msgid "(all books)"
 msgstr "（所有书籍）"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:56
 msgid "({0} of all)"
 msgstr ""
 
@@ -7801,18 +7995,31 @@ msgstr ""
 msgid "Sort by average rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:775
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:772
+msgid "Set the sort order for entries in the Tag Browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:778
 msgid "Match all"
 msgstr "匹配所有"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:775
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:778
 msgid "Match any"
 msgstr "匹配任一"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:783
+msgid ""
+"When selecting multiple entries in the Tag Browser match any or all of them"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:787
 msgid "Manage &user categories"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:790
+msgid "Add your own categories to the Tag Browser"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182
 msgid "Convert book %d of %d (%s)"
@@ -7838,15 +8045,15 @@ msgstr "为批处理排队书籍"
 msgid "Queueing "
 msgstr "正在排队 "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:239
 msgid "Fetch news from "
 msgstr "抓取新闻来源于 "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:301
 msgid "Convert existing"
 msgstr "转换现有"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:302
 msgid ""
 "The following books have already been converted to %s format. Do you wish to "
 "reconvert them?"
@@ -7860,77 +8067,70 @@ msgstr "恢复(&R)"
 msgid "&Donate to support calibre"
 msgstr "捐款赞助 Calibre 项目(&D)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:168
 msgid "&Eject connected device"
 msgstr "弹出已连接设备(&E)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:173
 msgid "&Restart"
 msgstr "重启(&R)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:206
-msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
-msgstr "<p>帮助参见：<a href=\"%s\">用户手册</a><br>"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:212
-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/ui.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:227
 msgid "Calibre Quick Start Guide"
 msgstr "Calibre 快速上手指南"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:389
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:380
 msgid "Cannot configure"
 msgstr "无法配置"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:376
 msgid "Cannot configure while there are running jobs."
 msgstr "有正在运行任务时无法进行配置。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:381
 msgid "Cannot configure before calibre is restarted."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:424
 msgid "No detailed info available"
 msgstr "无可用详细信息"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:425
 msgid "No detailed information is available for books on the device."
 msgstr "设备上书籍没有详细信息可用。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:486
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505
 msgid "Conversion Error"
 msgstr "转换错误"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:487
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:478
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using third party tools."
 msgstr "<p>无法转换：%s<p> 它是 <a href=\"%s\">DRM</a> 保护书籍。您需要首先使用第三方工具去除 DRM。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:491
 msgid "Recipe Disabled"
 msgstr "清单禁用"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:506
 msgid "<b>Failed</b>"
 msgstr "<b>失败</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:546
 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 "是众多全球志愿者的努力结晶。如果您觉得它有用，请考虑捐助支持开发。"
+"you find it useful, please consider donating to support its development. "
+"Your donation helps keep calibre development going."
+msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:572
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr "仍有任务运行。您是否希望退出？"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:575
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
@@ -7940,28 +8140,21 @@ msgstr ""
 "                      退出可能导致设备损坏。<br>\n"
 "                      确定退出么？"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:579
 msgid "WARNING: Active jobs"
 msgstr "警告：正在运行任务"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:640
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:632
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
 msgstr "将在系统栏中继续运行。要关闭，在系统栏菜单中选择<b>退出</b>。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/update.py:52
-msgid ""
-"<span style=\"color:red; font-weight:bold\">Latest version: <a "
-"href=\"%s\">%s</a></span>"
-msgstr ""
-"<span style=\"color:red; font-weight:bold\">最新版本：<a href=\"%s\">%s</a></span>"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/update.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:56
 msgid "Update available"
 msgstr "有可用更新"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/update.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:57
 msgid ""
 "%s has been updated to version %s. See the <a href=\"http://calibre-"
 "ebook.com/whats-new\">new features</a>. Visit the download page?"
@@ -8433,103 +8626,43 @@ msgstr "Shift+F3"
 msgid "Print eBook"
 msgstr "打印电子书"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238
 msgid "Copy Image"
 msgstr "复制图像"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:240
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:239
 msgid "Paste Image"
 msgstr "粘贴图像"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:270
-msgid ""
-"Library\n"
-"%d\n"
-"books"
-msgstr ""
-"书库\n"
-"%d\n"
-"本书"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:271
-msgid ""
-"Reader\n"
-"%s\n"
-"available"
-msgstr ""
-"阅读器\n"
-"%s\n"
-"可用"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:272
-msgid ""
-"Card A\n"
-"%s\n"
-"available"
-msgstr ""
-"存储卡 A\n"
-"%s\n"
-"可用"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:273
-msgid ""
-"Card B\n"
-"%s\n"
-"available"
-msgstr ""
-"存储卡 B\n"
-"%s\n"
-"可用"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:277
-msgid "Click to see the books available on your computer"
-msgstr "点击查看电脑上可用书籍"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:280
-msgid "Click to see the books in the main memory of your reader"
-msgstr "点击查看阅读区主存储中的书籍"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:281
-msgid "Click to see the books on storage card A in your reader"
-msgstr "点击查看阅读器存储卡 A 中的书籍"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:282
-msgid "Click to see the books on storage card B in your reader"
-msgstr "点击查看阅读器存储卡 B 中的书籍"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:290
-msgid "Books located at"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:364
 msgid "Change Case"
 msgstr "大小写转换"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:365
 msgid "Upper Case"
 msgstr "大写"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:366
 msgid "Lower Case"
 msgstr "小写"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:367
 msgid "Swap Case"
 msgstr "转换大小写"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:368
 msgid "Title Case"
 msgstr "标题大写"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:974
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:837
 msgid "Drag to resize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:869
 msgid "Show"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1012
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:876
 msgid "Hide"
 msgstr ""
 
@@ -9699,7 +9832,7 @@ msgid "User-created tag browser categories"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/config.py:702
-msgid "Preserve all collections even if not in library metadata."
+msgid "How and when calibre updates metadata on the device."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:43
@@ -9867,89 +10000,89 @@ msgstr "未知新闻来源"
 msgid "The \"%s\" recipe needs a username and password."
 msgstr "订阅清单“%s”需要用户名与密码。"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:706
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:708
 msgid "Download finished"
 msgstr "下载完成"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:708
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:710
 msgid "Failed to download the following articles:"
 msgstr "下载下列文章失败："
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:714
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:716
 msgid "Failed to download parts of the following articles:"
 msgstr "下载下列文章的某些部分失败："
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:716
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:718
 msgid " from "
 msgstr " 自 "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:718
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:720
 msgid "\tFailed links:"
 msgstr "\t失败链接："
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:807
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:809
 msgid "Could not fetch article. Run with -vv to see the reason"
 msgstr "无法抓取文章。使用 -vv 选项运行察看原因。"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:828
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:830
 msgid "Fetching feeds..."
 msgstr "正在抓取源..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:833
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:835
 msgid "Got feeds from index page"
 msgstr "从索引页面获取了源"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:839
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:841
 msgid "Trying to download cover..."
 msgstr "正在尝试下载封面..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:841
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Generating masthead..."
 msgstr "正在生成刊头..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:922
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:924
 msgid "Starting download [%d thread(s)]..."
 msgstr "开始下载 [ %d 线程数]..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:938
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:940
 msgid "Feeds downloaded to %s"
 msgstr "新闻源下载到 %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:948
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:950
 msgid "Could not download cover: %s"
 msgstr "无法下载封面：%s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:960
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
 msgid "Downloading cover from %s"
 msgstr "正在从 %s 下载封面"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1002
 msgid "Masthead image downloaded"
 msgstr "已下载刊头图像"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1190
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1192
 msgid "Untitled Article"
 msgstr "无标题文章"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1261
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1263
 msgid "Article downloaded: %s"
 msgstr "已下载文章：%s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1272
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1274
 msgid "Article download failed: %s"
 msgstr "下载失败文章：%s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1289
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1291
 msgid "Fetching feed"
 msgstr "抓取源"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1436
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1438
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
 msgstr "登录失败，检查您 calibre 期刊服务的用户名密码。"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1452
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1454
 msgid ""
 "You do not have permission to download this issue. Either your subscription "
 "has expired or you have exceeded the maximum allowed downloads for today."
@@ -10050,12 +10183,18 @@ msgstr "不下载 CSS 样式表。"
 #~ msgid "Sort tags list by popularity"
 #~ msgstr "按欢迎度排序标签"
 
+#~ 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>"
+
 #~ msgid "&Transliterate unicode characters to ASCII."
 #~ msgstr "将unicode字符转换为ASCII字符."
 
 #~ msgid "Sort by &popularity"
 #~ msgstr "按流行度排序(&P)"
 
+#~ msgid "Convert E-books"
+#~ msgstr "转换电子书"
+
 #~ msgid "Send specific format to storage card A"
 #~ msgstr "发送指定格式到存储卡 A"
 
@@ -10065,6 +10204,17 @@ msgstr "不下载 CSS 样式表。"
 #~ msgid "Device database corrupted"
 #~ msgstr "设备数据库损坏"
 
+#~ msgid ""
+#~ "<span style=\"color:red; font-weight:bold\">Latest version: <a "
+#~ "href=\"%s\">%s</a></span>"
+#~ msgstr ""
+#~ "<span style=\"color:red; font-weight:bold\">最新版本：<a href=\"%s\">%s</a></span>"
+
+#~ 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 "是众多全球志愿者的努力结晶。如果您觉得它有用，请考虑捐助支持开发。"
+
 #~ msgid "Click to turn off Cover Browsing"
 #~ msgstr "点击关闭封面浏览"
 
@@ -10079,6 +10229,42 @@ msgstr "不下载 CSS 样式表。"
 #~ "module failed:<br>"
 #~ msgstr "<p>已禁用封面浏览。<br>导入图片流模块失败：<br>"
 
+#~ msgid ""
+#~ "Reader\n"
+#~ "%s\n"
+#~ "available"
+#~ msgstr ""
+#~ "阅读器\n"
+#~ "%s\n"
+#~ "可用"
+
+#~ msgid ""
+#~ "Card A\n"
+#~ "%s\n"
+#~ "available"
+#~ msgstr ""
+#~ "存储卡 A\n"
+#~ "%s\n"
+#~ "可用"
+
+#~ msgid ""
+#~ "Card B\n"
+#~ "%s\n"
+#~ "available"
+#~ msgstr ""
+#~ "存储卡 B\n"
+#~ "%s\n"
+#~ "可用"
+
+#~ msgid ""
+#~ "Library\n"
+#~ "%d\n"
+#~ "books"
+#~ msgstr ""
+#~ "书库\n"
+#~ "%d\n"
+#~ "本书"
+
 #~ msgid ""
 #~ "The format in which to output the data. Available choices: %s. Defaults is "
 #~ "text."
@@ -10120,6 +10306,9 @@ msgstr "不下载 CSS 样式表。"
 #~ msgid "Communicate with the Sony PRS-600/700/900 eBook reader."
 #~ msgstr "与索尼 PRS-600/700/900 eBook reader 通信。"
 
+#~ msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
+#~ msgstr "<p>帮助参见：<a href=\"%s\">用户手册</a><br>"
+
 #~ msgid ""
 #~ "The value <b>%d</b> you have chosen for the content server port is a system "
 #~ "port. You operating system <b>may</b> not allow the server to run on this "
@@ -10138,3 +10327,6 @@ msgstr "不下载 CSS 样式表。"
 
 #~ msgid "(%d found)"
 #~ msgstr "（找到 %d 部）"
+
+#~ msgid "  "
+#~ msgstr "  "
diff --git a/src/calibre/translations/zh_TW.po b/src/calibre/translations/zh_TW.po
index 58d39942b5..9d8f98f598 100644
--- a/src/calibre/translations/zh_TW.po
+++ b/src/calibre/translations/zh_TW.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-07-03 01:21+0000\n"
-"PO-Revision-Date: 2010-07-02 18:09+0000\n"
+"POT-Creation-Date: 2010-07-09 22:00+0000\n"
+"PO-Revision-Date: 2010-07-09 20:15+0000\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: Chinese (traditional)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-03 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-07-10 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: zh_TW\n"
 
@@ -28,10 +28,10 @@ msgstr "完全不做任何事"
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:71
 #: /home/kovid/work/calibre/src/calibre/devices/prs500/books.py:267
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:466
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:492
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:396
-#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:98
-#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:101
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:97
+#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:100
 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/metadata.py:56
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:428
 #: /home/kovid/work/calibre/src/calibre/ebooks/fb2/input.py:67
@@ -73,9 +73,9 @@ msgstr "完全不做任何事"
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:818
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:49
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:51
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:910
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:915
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:981
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:911
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:916
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:982
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:137
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:139
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:108
@@ -103,20 +103,20 @@ msgstr "完全不做任何事"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:98
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:233
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:235
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:290
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:297
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:815
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:818
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:814
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:817
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:172
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:179
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:22
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:135
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:903
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:912
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1192
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1195
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:898
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:907
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1190
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1193
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:120
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:155
@@ -124,8 +124,8 @@ msgstr "完全不做任何事"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:172
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:362
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:877
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1054
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:882
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1060
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:87
 #: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:92
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:185
@@ -171,20 +171,20 @@ msgstr "元數據寫入器"
 msgid "Catalog generator"
 msgstr "分類產生器"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:15
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:16
 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 "追蹤 HTML 檔案中所有的本地端連結，並建立包含所有被連結檔案的 ZIP 檔。這個外掛程式會在您每次將 HTML 檔案加入書庫時執行。"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:51
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:52
 msgid ""
 "Character encoding for the input HTML files. Common choices include: cp1252, "
 "latin1, iso-8859-1 and utf-8."
 msgstr "輸入 HTML 檔案的編碼。一般的選擇包括： cp1252、 latin1、iso-8859-1 和 utf-8。"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:58
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:59
 msgid ""
 "Create a PMLZ archive containing the PML file and all images in the "
 "directory pmlname_img or images. This plugin is run every time you add a PML "
@@ -193,49 +193,49 @@ msgstr ""
 "建立包含 PML 檔案和在 pmlname_img 或 images 目錄中所有圖片的 PMLZ 壓縮檔。這個外掛程式會在您每次將 PML "
 "檔案加入書庫時執行。"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:90
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:93
 msgid "Extract cover from comic files"
 msgstr "從漫畫檔中擷取封面"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:117
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:128
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:140
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:150
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:160
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:171
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:181
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:191
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:201
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:211
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:221
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:232
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:243
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:255
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:276
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:287
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:297
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:307
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:120
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:131
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:143
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:153
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:163
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:174
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:184
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:194
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:204
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:214
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:224
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:235
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:246
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:258
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:279
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:290
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:300
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:310
 msgid "Read metadata from %s files"
 msgstr "從 %s 文件中讀取詮釋資料"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:266
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:269
 msgid "Read metadata from ebooks in RAR archives"
 msgstr "從用 RAR 格式壓縮的電子書檔案中讀取詮釋資料"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:318
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:321
 msgid "Read metadata from ebooks in ZIP archives"
 msgstr "從用ZIP格式壓縮的電子書檔案中讀取詮釋資料"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:331
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:341
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:351
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:373
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:384
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:394
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:334
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:344
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:354
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:376
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:387
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:397
 msgid "Set metadata in %s files"
 msgstr "在%s檔案中設定詮釋資料"
 
-#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:362
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:365
 msgid "Set metadata from %s files"
 msgstr "從%s檔案中設定詮釋資料"
 
@@ -379,35 +379,35 @@ msgstr "這個設定檔適用SONY PRS 系列，如 500/505/700 型號等，使
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr "這個設定檔適用於Amazon Kindle DX"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:31
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
 msgid "Installed plugins"
 msgstr "已安裝的外掛程式"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:32
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:33
 msgid "Mapping for filetype plugins"
 msgstr "檔案類型外掛程式對應"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:33
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:34
 msgid "Local plugin customization"
 msgstr "本地外掛程式自訂設置"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:34
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
 msgid "Disabled plugins"
 msgstr "已關閉的外掛程式"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36
 msgid "Enabled plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:83
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:84
 msgid "No valid plugin found in "
 msgstr "沒有在 中找到合適的外掛程式 "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:460
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:468
 msgid "Initialization of plugin %s failed with traceback:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:493
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
 msgid ""
 "    %prog options\n"
 "\n"
@@ -419,29 +419,29 @@ msgstr ""
 "    以載入的外部外掛程式自訂 calibre。\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:499
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
 msgid "Add a plugin by specifying the path to the zip file containing it."
 msgstr "指定含有外掛程式的 zip 檔案的路徑來加入一個外掛程式。"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:501
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
 msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
 msgstr "依名稱移除一個自訂的外掛程式。對內建外掛程式無效"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:503
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:511
 msgid ""
 "Customize plugin. Specify name of plugin and customization string separated "
 "by a comma."
 msgstr "自訂外掛程式。指定外掛程式的名稱以及用逗號分隔的自訂字串。"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:505
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:513
 msgid "List all installed plugins"
 msgstr "列出所有已安裝的外掛程式"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:507
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515
 msgid "Enable the named plugin"
 msgstr "開啟已經命名的外掛程式"
 
-#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517
 msgid "Disable the named plugin"
 msgstr "關閉已經命名的外掛程式"
 
@@ -592,7 +592,7 @@ msgstr "與翰林V5電子書通訊。"
 msgid "Communicate with the BOOX eBook reader."
 msgstr "與 BOOX eBook 閱讀器連接。"
 
-#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:121
+#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:123
 msgid ""
 "Comma separated list of directories to send e-books to on the device. The "
 "first one that exists will be used."
@@ -663,7 +663,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:51
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:54
 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:57
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:157
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:159
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:64
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:67
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:70
@@ -673,22 +673,22 @@ msgstr ""
 msgid "Getting list of books on device..."
 msgstr "從裝置中取得書籍列表"
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:218
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:258
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:219
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:263
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:244
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:262
 msgid "Removing books from device..."
 msgstr "正在從裝置中移除書籍..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:262
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:269
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:267
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:274
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:269
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:274
 msgid "Removing books from device metadata listing..."
 msgstr "將書籍從裝置的元數據清單移除..."
 
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:274
-#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:308
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:279
+#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:313
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:208
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:238
 msgid "Adding books to device metadata listing..."
@@ -706,6 +706,10 @@ msgstr ""
 msgid "Communicate with the Sweex MM300"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/devices/misc.py:75
+msgid "Communicate with the Pandigital Novel"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:17
 msgid "Communicate with the Nokia 770 internet tablet."
 msgstr "與 Nokia 770 internet tablet 連接。"
@@ -1499,6 +1503,51 @@ msgstr "正在對電子書籍進行轉換..."
 msgid "Creating"
 msgstr "建立中"
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/__init__.py:18
+msgid "ePub Fixer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/epubcheck.py:18
+msgid "Workaround epubcheck bugs"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/epubcheck.py:22
+msgid ""
+"Workarounds for bugs in the latest release of epubcheck. epubcheck reports "
+"many things as errors that are not actually errors. %prog will try to detect "
+"these and replace them with constructs that epubcheck likes. This may cause "
+"significant changes to your epub, complain to the epubcheck project."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:19
+msgid ""
+"%prog [options] file.epub\n"
+"\n"
+"Fix common problems in EPUB files that can cause them to be rejected by "
+"poorly designed publishing services.\n"
+"\n"
+"By default, no fixing is done and messages are printed out for each error "
+"detected. Use the options to control which errors are automatically fixed."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:50
+msgid "You must specify an epub file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:17
+msgid "Fix unmanifested files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:21
+msgid ""
+"Fix unmanifested files. %prog can either add them to the manifest or delete "
+"them as specified by the delete unmanifested option."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:32
+msgid "Delete unmanifested files instead of adding them to the manifest"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:56
 msgid ""
 "Extract the contents of the generated EPUB file to the specified directory. "
@@ -1826,11 +1875,11 @@ msgstr "漫畫"
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:98
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:882
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:887
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:543
 msgid "Title"
 msgstr "書名"
@@ -1839,7 +1888,7 @@ msgstr "書名"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:364
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:883
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:888
 msgid "Author(s)"
 msgstr "作者"
 
@@ -1862,7 +1911,7 @@ msgstr "製作人"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:67
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:318
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1073
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1079
 msgid "Comments"
 msgstr "評論"
 
@@ -1871,7 +1920,7 @@ msgstr "評論"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:306
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1069
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1075
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:139
 msgid "Tags"
 msgstr "標簽"
@@ -1881,7 +1930,7 @@ msgstr "標簽"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:46
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:323
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1084
 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:87
 msgid "Series"
 msgstr "系列"
@@ -1891,7 +1940,7 @@ msgid "Language"
 msgstr "語言"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:406
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1061
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1067
 msgid "Timestamp"
 msgstr "時間戳記"
 
@@ -2135,7 +2184,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1226
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1398
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1399
 msgid "Cover"
 msgstr "封面"
 
@@ -2174,70 +2223,70 @@ msgstr "所有文章"
 msgid "This is an Amazon Topaz book. It cannot be processed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1399
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1400
 msgid "Title Page"
 msgstr "標題頁"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1400
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1401
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:15
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:53
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:194
 msgid "Table of Contents"
 msgstr "目錄"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1401
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1402
 msgid "Index"
 msgstr "索引"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1402
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1403
 msgid "Glossary"
 msgstr "辭彙"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1403
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1404
 msgid "Acknowledgements"
 msgstr "致謝"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1404
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1405
 msgid "Bibliography"
 msgstr "參考書目"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1405
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1406
 msgid "Colophon"
 msgstr "版權頁"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1406
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1407
 msgid "Copyright"
 msgstr "版權所有"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1407
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1408
 msgid "Dedication"
 msgstr "呈獻"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1408
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1409
 msgid "Epigraph"
 msgstr "題辭"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1409
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1410
 msgid "Foreword"
 msgstr "序"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1410
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1411
 msgid "List of Illustrations"
 msgstr "插圖的清單"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1411
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1412
 msgid "List of Tables"
 msgstr "表格的清單"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1412
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1413
 msgid "Notes"
 msgstr "備註"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1413
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1414
 msgid "Preface"
 msgstr "序"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1414
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1415
 msgid "Main Text"
 msgstr "主文"
 
@@ -2281,7 +2330,7 @@ msgstr "側邊欄"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:22
 #: /home/kovid/work/calibre/src/calibre/ebooks/tcr/input.py:23
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:23
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:24
 msgid ""
 "Normally calibre treats blank lines as paragraph markers. With this option "
 "it will assume that every line represents a paragraph instead."
@@ -2289,7 +2338,7 @@ msgstr "一般而言 calibre 會把空行視為段落標記。使用這個選項
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:26
 #: /home/kovid/work/calibre/src/calibre/ebooks/tcr/input.py:27
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:27
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:28
 msgid ""
 "Normally calibre treats blank lines as paragraph markers. With this option "
 "it will assume that every line starting with an indent (either a tab or 2+ "
@@ -2442,7 +2491,7 @@ msgstr ""
 "取得關於這個 PDF 的資訊。\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:29
 msgid "Author"
 msgstr "作者"
@@ -2601,19 +2650,19 @@ msgid ""
 "slowest."
 msgstr "指定要使用的壓縮等級。比例為 1 到 10。1 是最少的壓縮但速度最快，而 10 為最高的壓縮但速度最慢。"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:33
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:34
 msgid ""
 "Normally extra spaces are condensed into a single space. With this option "
 "all spaces will be displayed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:36
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:37
 msgid ""
 "Run the text input through the markdown pre-processor. To learn more about "
 "markdown see"
 msgstr "透過 markdown 前處理器執行文字輸入。要了解更多關於 markdown 的資訊請看"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:39
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:40
 msgid "Do not insert a Table of Contents into the output text."
 msgstr "不要在輸出的文字中插入目錄頁。"
 
@@ -2779,7 +2828,7 @@ msgstr "複製"
 msgid "Copy to Clipboard"
 msgstr "複製到剪貼簿"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:400
 msgid "Choose Files"
 msgstr "選擇檔案"
 
@@ -2794,13 +2843,13 @@ msgid "User annotations generated from main library only"
 msgstr "使用者註記只從主要書庫產生"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:75
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:612
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:671
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:708
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:729
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:877
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1060
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:670
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:707
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:728
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:876
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:941
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1059
 msgid "No books selected"
 msgstr "尚未選取書籍"
 
@@ -2840,209 +2889,209 @@ msgstr "有多少空白書籍？"
 msgid "How many empty books should be added?"
 msgstr "有多少空白書籍要加入？"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:340
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:339
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:390
 msgid "Uploading books to device."
 msgstr "正在上傳書籍到裝置。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:350
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:137
 msgid "Books"
 msgstr "書籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:351
 msgid "EPUB Books"
 msgstr "EPUB 書籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:352
 msgid "LRF Books"
 msgstr "LRF 書籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:353
 msgid "HTML Books"
 msgstr "HTML 書籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:354
 msgid "LIT Books"
 msgstr "LIT 書籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:355
 msgid "MOBI Books"
 msgstr "MOBI 書籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:356
 msgid "Topaz books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:357
 msgid "Text books"
 msgstr "純文字書籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:359
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:358
 msgid "PDF Books"
 msgstr "PDF 書籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:359
 msgid "Comics"
 msgstr "漫畫"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:361
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:360
 msgid "Archives"
 msgstr "壓縮檔"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:364
 msgid "Supported books"
 msgstr "支援的書籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:399
 msgid "Merged some books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:401
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:400
 msgid ""
 "Some duplicates were found and merged into the following existing books:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:410
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:409
 msgid "Failed to read metadata"
 msgstr "無法讀取元數據"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:410
 msgid "Failed to read metadata from the following"
 msgstr "無法從以下項目讀取元數據"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:434
 msgid "Add to library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:430
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:460
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1229
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:429
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:459
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1228
 msgid "No book selected"
 msgstr "尚未選取書籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:435
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:434
 msgid "No book files found"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:457
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:456
 msgid "Cannot delete"
 msgstr "無法刪除"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:470
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:469
 msgid "Choose formats to be deleted"
 msgstr "選擇要刪除的格式"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:488
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:487
 msgid "Choose formats <b>not</b> to be deleted"
 msgstr "選擇<b>不要</b>刪除的格式"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:507
 msgid "Cannot delete books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:509
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:508
 msgid "No device is connected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:519
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:518
 msgid "Main memory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:519
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:444
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:453
 msgid "Storage Card A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:521
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:520
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:446
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:455
 msgid "Storage Card B"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:525
 msgid "No books to delete"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:526
 msgid "None of the selected books are on the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:544
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:543
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:600
 msgid "Deleting books from device."
 msgstr "正在從裝置中刪除書籍。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:564
 msgid ""
 "The selected books will be <b>permanently deleted</b> and the files removed "
 "from your computer. Are you sure?"
 msgstr "選取的書籍會被<b>永久刪除</b>而檔案會從您的電腦中移除。您確定嗎？"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:585
 msgid ""
 "The selected books will be <b>permanently deleted</b> from your device. Are "
 "you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:610
 msgid "Cannot download metadata"
 msgstr "不能下載元數據"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:627
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:626
 msgid "social metadata"
 msgstr "社交網路元數據"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
 msgid "covers"
 msgstr "封面"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:628
 msgid "metadata"
 msgstr "元數據"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:630
 msgid "Downloading %s for %d book(s)"
 msgstr "正在下載 %s，用於 %d 書"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:654
 msgid "Failed to download some metadata"
 msgstr "下載部分元數據失敗"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:656
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:655
 msgid "Failed to download metadata for the following:"
 msgstr "以下項目下載元數據失敗："
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:659
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:658
 msgid "Failed to download metadata:"
 msgstr "下載元數據失敗："
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:660
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:659
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:637
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:522
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:949
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:951
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:53
 msgid "Error"
 msgstr "錯誤"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:670
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:707
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:669
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:706
 msgid "Cannot edit metadata"
 msgstr "不能編輯元數據"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:728
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:731
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:727
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:730
 msgid "Cannot merge books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:732
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:731
 msgid "At least two books must be selected for merging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:736
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:735
 msgid ""
 "All book formats and metadata from the selected books will be added to the "
 "<b>first selected book.</b><br><br> The second and subsequently selected "
@@ -3050,7 +3099,7 @@ msgid ""
 "proceed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:747
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:746
 msgid ""
 "All book formats and metadata from the selected books will be merged into "
 "the <b>first selected book</b>.<br><br>After merger the second and "
@@ -3060,51 +3109,51 @@ msgid ""
 "from your computer.<br><br>  Are you <b>sure</b> you want to proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:759
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:758
 msgid ""
 "You are about to merge more than 5 books.  Are you <b>sure</b> you want to "
 "proceed?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:876
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:875
 msgid "Cannot save to disk"
 msgstr "不能儲存到磁碟"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:879
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:878
 msgid "Choose destination directory"
 msgstr "選擇目的端目錄"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:912
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:911
 msgid "Error while saving"
 msgstr "當儲存時發生錯誤"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:913
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:912
 msgid "There was an error while saving."
 msgstr "當儲存時發生錯誤。"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:919
 #: /home/kovid/work/calibre/src/calibre/gui2/actions.py:920
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:921
 msgid "Could not save some books"
 msgstr "不能儲存某些書籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:922
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:921
 msgid "Click the show details button to see which ones."
 msgstr "點選顯示詳細資料按鈕"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:942
 msgid "No books selected to generate catalog for"
 msgstr "沒有選取書籍來建立分類"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:960
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:959
 msgid "Generating %s catalog..."
 msgstr "正在產生 %s 分類.."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:965
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:964
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:264
 msgid "No books found"
 msgstr "找不到書籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:966
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:965
 msgid ""
 "No books to catalog\n"
 "Check exclude tags"
@@ -3112,49 +3161,49 @@ msgstr ""
 "沒有可分類的書籍\n"
 "請檢查排除的標籤"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:976
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:975
 msgid "Catalog generated."
 msgstr "分類已產生。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:979
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:978
 msgid "Export Catalog Directory"
 msgstr "匯出分類目錄"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:980
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:979
 msgid "Select destination for %s.%s"
 msgstr "選擇 %s 的目的端。%s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:996
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:995
 msgid "Fetching news from "
 msgstr "取回新聞於 "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1009
 msgid " fetched."
 msgstr " 已取回。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1059
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1058
 msgid "Cannot convert"
 msgstr "不能轉換"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1088
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1087
 msgid "Starting conversion of %d book(s)"
 msgstr "正在開始 %d 本書的轉換"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1204
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1265
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1264
 msgid "Cannot view"
 msgstr "不能檢視"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1210
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1209
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
 msgid "Choose the format to view"
 msgstr "選擇要檢視的格式"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1218
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1217
 msgid "Multiple Books Selected"
 msgstr "已選取多個書籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1219
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1218
 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 "
@@ -3162,11 +3211,11 @@ msgid ""
 "continue?"
 msgstr "您正嘗試開啟 %d 本書。同時開啟太多書可能會很慢並且對您的電腦的回應有負面效果。當這個程序開始後直到完成之前都不能停止。您想要繼續嗎？"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1228
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1227
 msgid "Cannot open folder"
 msgstr "不能開啟資料夾"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1266
+#: /home/kovid/work/calibre/src/calibre/gui2/actions.py:1265
 msgid "%s has no available formats."
 msgstr "%s 沒有可用的格式。"
 
@@ -3191,7 +3240,7 @@ msgid "The specified directory could not be processed."
 msgstr "指定的目錄無法處理。"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:263
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:845
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:840
 msgid "No books"
 msgstr "沒有書籍"
 
@@ -3315,15 +3364,15 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:52
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:79
 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:80
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:594
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:633
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:637
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:366
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:371
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:385
@@ -3347,12 +3396,12 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:265
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:75
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:80
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:186
@@ -3382,8 +3431,9 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:313
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1059
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1065
 msgid "Path"
 msgstr "路徑"
 
@@ -3400,8 +3450,8 @@ msgid "Formats"
 msgstr "格式"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:25
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:886
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1062
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:891
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1068
 msgid "Collections"
 msgstr ""
 
@@ -3414,12 +3464,12 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:305
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:311
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:317
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1068
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1072
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1074
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73
 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:458
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:467
 msgid "None"
 msgstr "沒有"
 
@@ -4493,11 +4543,11 @@ msgstr ""
 "則會比對任何標籤。</p><p>要學習更多關於 XPath 的進階用法，請查閱 <a href=\"http://calibre-"
 "ebook.com/user_manual/xpath.html\">XPath Tutorial</a>。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:127
 msgid "Cover browser could not be loaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:171
+#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:179
 msgid "Browse by covers"
 msgstr "依封面瀏覽"
 
@@ -4687,128 +4737,124 @@ msgstr "裝置： "
 msgid " detected."
 msgstr " 被偵測到。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:778
-msgid "Connected "
-msgstr "已連線 "
-
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:846
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841
 msgid "selected to send"
 msgstr "選擇要傳送的項目"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:851
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:846
 msgid "Choose format to send to device"
 msgstr "選擇要傳送到裝置的格式"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:860
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:855
 msgid "No device"
 msgstr "沒有裝置"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:856
 msgid "Cannot send: No device is connected"
 msgstr "不能傳送：沒有連線中的裝置"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:868
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:859
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:863
 msgid "No card"
 msgstr "沒有記憶卡"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:869
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:860
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864
 msgid "Cannot send: Device has no storage card"
 msgstr "不能傳送：裝置沒有記憶卡"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:910
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:905
 msgid "E-book:"
 msgstr "電子書："
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:913
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:908
 msgid "Attached, you will find the e-book"
 msgstr "已附加，您會發現電子書"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:914
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:909
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:181
 msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:915
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:910
 msgid "in the %s format."
 msgstr "%s 格式。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:928
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:923
 msgid "Sending email to"
 msgstr "傳送電子郵件到"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:958
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:965
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1057
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1118
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1236
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1243
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:953
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:961
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1053
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1115
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1234
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1242
 msgid "No suitable formats"
 msgstr "沒有合適的格式"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:959
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:954
 msgid "Auto convert the following books before sending via email?"
 msgstr "是否在透過電子郵件傳送前自動轉換下列書籍？"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:966
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:962
 msgid ""
 "Could not email the following books as no suitable formats were found:"
 msgstr "無法透過電子郵件傳送前下列書籍，因為找不到適合的格式："
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:984
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:980
 msgid "Failed to email books"
 msgstr "無法寄出書籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:985
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:981
 msgid "Failed to email the following books:"
 msgstr "無法寄出下列書籍："
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:989
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:985
 msgid "Sent by email:"
 msgstr "以電子郵件傳送："
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1016
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1012
 msgid "News:"
 msgstr "新聞："
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1017
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1013
 msgid "Attached is the"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1028
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1024
 msgid "Sent news to"
 msgstr "傳送新聞到"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1058
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1237
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1054
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1235
 msgid "Auto convert the following books before uploading to the device?"
 msgstr "是否在上傳到裝置前自動轉換下列書籍？"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1087
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1084
 msgid "Sending catalogs to device."
 msgstr "正在傳送分類到裝置。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1150
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1148
 msgid "Sending news to device."
 msgstr "正在傳送新聞到裝置。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1203
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1201
 msgid "Sending books to device."
 msgstr "正在傳送書籍到裝置。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1244
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1243
 msgid ""
 "Could not upload the following books to the device, as no suitable formats "
 "were found. Convert the book(s) to a format supported by your device first."
 msgstr "無法上傳下列書籍到裝置，因為找不到適合的格式。請先將書籍轉換為您的裝置支援的格式。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1305
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1304
 msgid "No space on device"
 msgstr "裝置上已無空間"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1306
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1305
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr "<p>不能上傳書籍到裝置，因為已無更多可用空間 "
@@ -4846,7 +4892,7 @@ msgid "My Books"
 msgstr "我的書籍"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:69
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:289
 msgid "Generate catalog"
 msgstr "產生分類"
 
@@ -4985,157 +5031,157 @@ msgstr ""
 msgid "Narrow"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:502
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:503
 msgid "System port selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:503
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:504
 msgid ""
 "The value <b>%d</b> you have chosen for the content server port is a system "
 "port. Your operating system <b>may</b> not allow the server to run on this "
 "port. To be safe choose a port number larger than 1024."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:524
 msgid "Failed to install command line tools."
 msgstr "安裝命令列工具失敗。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:527
 msgid "Command line tools installed"
 msgstr "命令列工具已安裝"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:528
 msgid "Command line tools installed in"
 msgstr "命令列工具已安裝於"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:529
 msgid ""
 "If you move calibre.app, you have to re-install the command line tools."
 msgstr "如果您移動 calibre.app，您必須重新安裝命令列工具。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:580
 msgid "No valid plugin path"
 msgstr "沒有有效的外掛程式路徑"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:581
 msgid "%s is not a valid plugin path"
 msgstr "%s 不是有效的外掛程式路徑"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:584
 msgid "Choose plugin"
 msgstr "選擇外掛程式"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:596
 msgid "Plugin cannot be disabled"
 msgstr "外掛程式不能停用"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:597
 msgid "The plugin: %s cannot be disabled"
 msgstr "外掛程式：%s 不能停用"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:606
 msgid "Plugin not customizable"
 msgstr "外掛程式不可自訂"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:607
 msgid "Plugin: %s does not need customization"
 msgstr "外掛程式：%s 不需要自訂"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:615
 msgid "Customize"
 msgstr "自訂"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:652
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:653
 msgid "Cannot remove builtin plugin"
 msgstr "不能移除內建的外掛程式"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:653
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:654
 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
 msgstr " 不能移除。它是內建的外掛程式。請嘗試停用它來代替。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:684
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:685
 msgid "You must select a column to delete it"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:689
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:690
 msgid "The selected column is not a custom column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:690
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:691
 #: /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/config/__init__.py:691
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:692
 msgid "Do you really want to delete column %s and all its data?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:758
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:759
 msgid "Error log:"
 msgstr "錯誤紀錄檔："
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:765
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:766
 msgid "Access log:"
 msgstr "存取紀錄檔："
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:793
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:794
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:332
 msgid "Failed to start content server"
 msgstr "啟動內容伺服器失敗"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:817
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:818
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:587
 msgid "Select location for books"
 msgstr "選擇書籍的位置"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:824
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:825
 msgid "Invalid size"
 msgstr "不正確的大小"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:825
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:826
 msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr "尺寸 %s 是無效的。格式必須為 寬度x高度"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:884
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:889
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:891
 msgid "Invalid database location"
 msgstr "無效的資料庫位置"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:885
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:887
 msgid "Invalid database location "
 msgstr "無效的資料庫位置 "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:886
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:888
 msgid "<br>Must be a directory."
 msgstr "<br>必須是目錄。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:890
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:892
 msgid "Invalid database location.<br>Cannot write to "
 msgstr "無效的資料庫位置。<br>不能寫入 "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:895
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:897
 msgid "Must restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:896
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:898
 msgid ""
 "The changes you made require that Calibre be restarted. Please restart as "
 "soon as practical."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:930
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:932
 msgid "Checking database integrity"
 msgstr "正在檢查資料庫完整性"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:950
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:952
 msgid "Failed to check database integrity"
 msgstr "檢查資料庫完整性失敗"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:957
 msgid "Some inconsistencies found"
 msgstr "發現某些不一致"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:956
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:958
 msgid ""
 "The following books had formats listed in the database that are not actually "
 "available. The entries for the formats have been removed. You should check "
@@ -5266,221 +5312,225 @@ msgstr ""
 msgid "Sending to &device"
 msgstr "傳送到裝置(&D)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:551
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:167
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:554
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:201
 msgid "Preferences"
 msgstr "偏好設定"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
 msgstr "電子書位置（電子書儲存在資料夾中以作者排序，而元數據則儲存在 metadata.db 檔案中）(&L)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
 msgid "Browse for the new database location"
 msgstr "瀏覽新的資料庫位置"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
 msgid "Show notification when &new version is available"
 msgstr "當有新版本可用時顯示通知(&N)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
 msgid "Download &social metadata (tags/ratings/etc.) by default"
 msgstr "預設下載社交網路元數據 (標籤/評等/其他)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:557
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:560
 msgid "&Overwrite author and title by default when fetching metadata"
 msgstr "當取得元數據時覆蓋作者和書名(&O)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:558
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
 msgid "Default network &timeout:"
 msgstr "預設網路逾時時間(&T):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:559
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
 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/config_ui.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
 msgid " seconds"
 msgstr " 秒"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:561
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
 msgid "Choose &language (requires restart):"
 msgstr "選擇語言（需重新啟動）(&L):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:562
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
 msgid "Normal"
 msgstr "一般"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:563
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
 msgid "High"
 msgstr "高"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:564
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
 msgid "Low"
 msgstr "低"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:568
 msgid "Job &priority:"
 msgstr "工作優先權(&P):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:566
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:569
 msgid "Preferred &output format:"
 msgstr "偏好的輸出格式(&O):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:567
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
 msgid "Preferred &input format order:"
 msgstr "偏好的輸入格式(&I):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:570
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
 msgid "Use &Roman numerals for series number"
 msgstr "在叢書編號使用羅馬數字(&R)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
 msgid "Enable system &tray icon (needs restart)"
 msgstr "啟用系統匣圖示（需要重新啟動）(&T)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:572
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
 msgid "Show &notifications in system tray"
 msgstr "在系統匣中顯示通知(&N)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:573
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
 msgid "Show &splash screen at startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:574
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
 msgid "Show cover &browser in a separate window (needs restart)"
 msgstr "在個別視窗中顯示封面瀏覽器（需要重新啟動）(&B)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:575
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
 msgid "Show &average ratings in the tags browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:576
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
 msgid "Search as you type"
 msgstr "隨打即查"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:577
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
 msgid "Automatically send downloaded &news to ebook reader"
 msgstr "自動將下載的新聞傳送到電子書閱讀器(&N)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:578
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
 msgid "&Delete news from library when it is automatically sent to reader"
 msgstr "當新聞自動傳送到閱讀器後將它自書庫刪除(&D)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:579
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
 msgid "&Number of covers to show in browse mode (needs restart):"
 msgstr "在瀏覽模式中要顯示的封面數（需重新啟動）(&N):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
 msgid "Toolbar"
 msgstr "工具列"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:581
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
 msgid "Large"
 msgstr "大"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:582
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
 msgid "Medium"
 msgstr "中"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
 msgid "Small"
 msgstr "小"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:587
 msgid "&Button size in toolbar"
 msgstr "工具列按鈕大小(&B)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:585
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
 msgid "Show &text in toolbar buttons"
 msgstr "在工具列按鈕中顯示文字(&T)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:586
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:589
 msgid "Select visible &columns in library view"
 msgstr "選擇在書庫檢視中顯示的欄位(&C)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:588
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:591
 msgid "Remove a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:590
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:593
 msgid "Add a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
 msgid "Edit settings of a user-defined column"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:595
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
 msgid "Use internal &viewer for:"
 msgstr "使用內部檢視器於(&V):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
 msgid "User Interface &layout (needs restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:597
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
 msgid "Disable all animations. Useful if you have a slow/old computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:598
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
 msgid "Disable &animations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:599
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
+msgid "Show &donate button (restart)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
 msgid "Add an email address to which to send books"
 msgstr "加入要傳送電子書的電子郵件位址"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:600
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
 msgid "&Add email"
 msgstr "加入電子郵件(&A)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:601
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
 msgid "Make &default"
 msgstr "成為預設值(&D)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:602
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
 msgid "&Remove email"
 msgstr "移除電子郵件"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:603
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
 msgid ""
 "calibre can send your books to you (or your reader) by email. Emails will be "
 "automatically sent for downloaded news to all email addresses that have Auto-"
 "send checked."
 msgstr "calibre 可以將書籍透過電子郵件傳送給您（或您的閱讀器）。已下載的新聞會自動傳送到所有有核取「自動傳送」的電子郵件位址。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:604
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
 msgid "&Maximum number of waiting worker processes (needs restart):"
 msgstr "等待 worker 程序的最大數目（需重新啟動）(&M)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:605
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
 msgid "&Check database integrity"
 msgstr "檢查資料庫完整性(&C)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:606
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
 msgid "&Install command line tools"
 msgstr "安裝命令列工具(&I)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:607
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
 msgid "Open calibre &configuration directory"
 msgstr "開啟 &calibre 組態目錄"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:608
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
 msgid "Limit the max. simultaneous jobs to the available CPU &cores"
 msgstr "限制最大同時工作不超過可用的 &CPU 核心"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:609
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
 msgid "Debug &device detection"
 msgstr "裝置偵測除錯(&D)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:610
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
 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 "
@@ -5488,75 +5538,75 @@ msgid ""
 msgstr ""
 "calibre 包含了一個網路伺服器，讓您可以在世界的任何地方使用瀏覽器存取您的書籍收藏。任何對這個設定值的改變都要在伺服器重新啟動後才會生效。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:611
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:615
 msgid "Server &port:"
 msgstr "伺服器連接埠(&P):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:612
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:212
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:117
 msgid "&Username:"
 msgstr "使用者名稱(&U):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:613
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:213
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:119
 msgid "&Password:"
 msgstr "密碼(&P):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:614
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
 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/config_ui.py:615
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
 msgid ""
 "The maximum size (widthxheight) for displayed covers. Larger covers are "
 "resized. "
 msgstr "顯示封面的最大尺寸 (寬度x高度)。太大的封面會被調整大小。 "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:616
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
 msgid "Max. &cover size:"
 msgstr "最大封面尺寸(&C):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:617
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:621
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:214
 msgid "&Show password"
 msgstr "顯示密碼(&S)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:618
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
 msgid "Max. &OPDS items per query:"
 msgstr "每次查詢最大 &OPDS 項目："
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:619
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
 msgid "Max. OPDS &ungrouped items:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:620
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
 msgid "&Start Server"
 msgstr "啟動伺服器(&S)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:621
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
 msgid "St&op Server"
 msgstr "停止伺服器(&O)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:622
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:626
 msgid "&Test Server"
 msgstr "測試伺服器(&T)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:623
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
 msgid "Run server &automatically on startup"
 msgstr "啟動時自動執行伺服器(&A)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:624
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:628
 msgid "View &server logs"
 msgstr "檢視伺服器紀錄檔(&S)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:625
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:46
 msgid ""
 "<p>Remember to leave calibre running as the server only runs as long as "
@@ -5570,33 +5620,33 @@ msgstr ""
 "<p>Stanza 應該能自動看到您的 calibre 藏書。如果沒有，請試著在您 iPhone 上的 Stanza 閱讀器把 URL "
 "http://myhostname:8080 加入為新的分類。其中 myhostname 應該是執行 calibre 的電腦的有效主機名稱或 IP 位址。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:627
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:631
 msgid ""
 "Here you can customize the behavior of Calibre by controlling what plugins "
 "it uses."
 msgstr "您可以在這裡自訂 Caligre 的行為，控制它使用何種外掛程式。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:628
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:632
 msgid "Enable/&Disable plugin"
 msgstr "啟用/停用外掛程式(&D)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:629
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:633
 msgid "&Customize plugin"
 msgstr "自訂外掛程式(&C)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:630
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:634
 msgid "&Remove plugin"
 msgstr "移除外掛程式(&R)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:631
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:635
 msgid "Add new plugin"
 msgstr "加入新的外掛程式"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:632
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:636
 msgid "Plugin &file:"
 msgstr "外掛程式檔案(&F):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:634
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/config_ui.py:638
 msgid "&Add"
 msgstr "加入(&A)"
 
@@ -5634,9 +5684,9 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_ct_column_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/create_custom_column.py:31
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:884
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:889
 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:542
 msgid "Date"
 msgstr "日期"
@@ -5830,12 +5880,18 @@ msgstr "再次顯示這個警告(&S)"
 msgid "ERROR"
 msgstr "錯誤"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:67
+msgid ""
+"All checked books will be <b>permanently deleted</b> from your device. "
+"Please verify the list."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75
 msgid "Location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:70
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1058
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1064
 msgid "Format"
 msgstr "格式"
 
@@ -6637,6 +6693,10 @@ msgstr "如果您想要的標籤不在可用的清單中，您可以在這裡加
 msgid "Add tag to available tags and apply it to current book"
 msgstr "將標籤加入可用的標籤並套用到目前的書籍"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:20
+msgid "%s (was %s)"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:501
 msgid "Item is blank"
@@ -6989,146 +7049,162 @@ msgstr "正規表示式 (?P<isbn>)"
 msgid "Save single format to disk..."
 msgstr "儲存單一格式到磁碟..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:53
 msgid "Edit metadata individually"
 msgstr "個別編輯元數據"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:56
 msgid "Edit metadata in bulk"
 msgstr "大量編輯元數據"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:59
 msgid "Download metadata and covers"
 msgstr "下載元數據和封面"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:62
 msgid "Download only metadata"
 msgstr "只下載元數據"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:64
 msgid "Download only covers"
 msgstr "只下載封面"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:67
 msgid "Download only social metadata"
 msgstr "只下載社交網路元數據"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:72
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:73
 msgid "Merge into first selected book - delete others"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:75
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:76
 msgid "Merge into first selected book - keep others"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:83
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:84
 msgid "Add books from a single directory"
 msgstr "從單一目錄加入書籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:86
 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/init.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:90
 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/init.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:93
 msgid "Add Empty book. (Book entry with no formats)"
 msgstr "加入空的電子書（沒有格式的書籍）"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:102
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:103
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
 msgid "Save to disk"
 msgstr "儲存至磁碟"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:104
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:105
 msgid "Save to disk in a single directory"
 msgstr "儲存到磁碟的單一目錄"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:106
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:402
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:394
 msgid "Save only %s format to disk"
 msgstr "只儲存 %s 格式到磁碟"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:110
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:397
 msgid "Save only %s format to disk in a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:119
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
 msgid "View"
 msgstr "檢視"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:121
 msgid "View specific format"
 msgstr "檢視指定的格式"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:127
 msgid "Remove selected books"
 msgstr "移除選取的書籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:129
 msgid "Remove files of a specific format from selected books.."
 msgstr "從選取書籍中移除指定格式的檔案.."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:132
 msgid "Remove all formats from selected books, except..."
 msgstr "從選取書籍移除所有的格式，除了..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:135
 msgid "Remove covers from selected books"
 msgstr "移除選取的書籍中的封面"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:138
 msgid "Remove matching books from device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:155
 msgid "Convert individually"
 msgstr "個別轉換"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:157
 msgid "Bulk convert"
 msgstr "大量轉換"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:161
 msgid "Create catalog of books in your calibre library"
 msgstr "在您的 calibre 書庫建立書籍的分類"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:169
 msgid "Run welcome wizard"
 msgstr "執行歡迎精靈"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:200
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:205
 msgid "Similar books..."
 msgstr "類似的書籍..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:232
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:237
 msgid "Add books to library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:234
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:241
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:248
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:239
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:246
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:253
 msgid "Manage collections"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:328
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:333
 msgid "Cover Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:351
 msgid "Tag Browser"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:394
-#: /home/kovid/work/calibre/src/calibre/gui2/init.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:372
+msgid "version"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:373
+msgid "created by Kovid Goyal"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:391
+msgid "Connected "
+msgstr "已連線 "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:400
+msgid "Update found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:445
+#: /home/kovid/work/calibre/src/calibre/gui2/init.py:454
 msgid "Book Details"
 msgstr ""
 
@@ -7212,29 +7288,29 @@ msgid "Rating"
 msgstr "評等"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:324
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1078
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1084
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr "書籍 <font face=\"serif\">%s</font> / %s。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:674
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1176
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:679
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1182
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399
 msgid "The lookup/search name is \"{0}\""
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:881
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:886
 msgid "In Library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:885
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:890
 msgid "Size"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1156
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1162
 msgid "Marked for deletion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1165
 msgid "Double click to <b>edit</b> me<br><br>"
 msgstr "請雙擊以<b>編輯</b>我<br><br>"
 
@@ -7278,11 +7354,11 @@ msgstr ""
 msgid "Restore default layout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:524
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:525
 msgid "Not allowed"
 msgstr "不允許的"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:526
 msgid ""
 "Dropping onto a device is not supported. First add the book to the calibre "
 "library."
@@ -7479,155 +7555,163 @@ msgstr "嘗試重新啟動您的電腦。"
 msgid "try deleting the file"
 msgstr "嘗試刪除檔案"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:247
 msgid "calibre"
 msgstr "calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:249
 msgid "&Restrict to:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:250
 msgid ""
 "Books display will be restricted to those matching the selected saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:251
 msgid "set in ui.py"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:252
 msgid "Advanced search"
 msgstr "進階搜尋"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:254
 msgid "Alt+S"
 msgstr "Alt+S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:255
 msgid "&Search:"
 msgstr "搜尋(&S):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:263
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:256
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:257
 msgid ""
 "<p>Search the list of books by title, author, publisher, tags, comments, "
 "etc.<br><br>Words separated by spaces are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:258
 msgid "Reset Quick Search"
 msgstr "重設快速搜尋"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
-msgid "Choose saved search or enter name for new saved search"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:260
 msgid "Copy current search text (instead of search name)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:262
 msgid "Save current search under the name shown in the box"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:264
 msgid "Delete current saved search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:266
 msgid "Add books"
 msgstr "加入書籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:267
 msgid "A"
 msgstr "A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:276
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:268
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:269
 msgid "Remove books"
 msgstr "移除書籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:270
 msgid "Del"
 msgstr "Del"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:271
 msgid "Edit meta information"
 msgstr "編輯元數據資訊"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:272
 msgid "E"
 msgstr "E"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:273
 msgid "Merge book records"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274
 msgid "M"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:275
 msgid "Send to device"
 msgstr "傳送到裝置"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
 msgid "S"
 msgstr "S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
 msgid "Fetch news"
 msgstr "取回新聞"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
 msgid "Convert E-books"
 msgstr "轉換電子書"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
 msgid "C"
 msgstr "C"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
 msgid "V"
 msgstr "V"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
 msgid "Open containing folder"
 msgstr "開啟包含的資料夾"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
 msgid "Show book details"
 msgstr "顯示書籍詳細資料"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
 msgid "Books by same author"
 msgstr "同樣作者的書籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
 msgid "Books in this series"
 msgstr "在這套叢書中的書籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
 msgid "Books by this publisher"
 msgstr "這個出版社的書籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
 msgid "Books with the same tags"
 msgstr "同樣標籤的書籍"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
 msgid "Configure calibre"
 msgstr "設定 calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
 msgid "Ctrl+P"
 msgstr "Ctrl+P"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
+msgid "Help"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
+msgid "Browse the calibre User Manual"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
+msgid "F1"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:20
 msgid ""
 "Redirect console output to a dialog window (both stdout and stderr). Useful "
@@ -7654,32 +7738,36 @@ msgstr "具有書名或 ISBN 的書籍"
 msgid "No matches found for this book"
 msgstr "找不到這本書的符合項"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:91
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:260
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:262
 msgid "Search"
 msgstr "搜尋"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:313
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:315
 msgid "The selected search will be <b>permanently deleted</b>. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:355
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:357
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr "搜尋（要使用進階搜尋請按左邊的按鈕）"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:392
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:398
 msgid "Saved Searches"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:406
+msgid "Choose saved search or enter name for new saved search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:47
 msgid "({0} of {1})"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:53
 msgid "(all books)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:55
 msgid "({0} of all)"
 msgstr ""
 
@@ -7802,18 +7890,31 @@ msgstr ""
 msgid "Sort by average rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:775
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:772
+msgid "Set the sort order for entries in the Tag Browser"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:778
 msgid "Match all"
 msgstr "符合全部"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:775
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:778
 msgid "Match any"
 msgstr "符合任何"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:780
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:783
+msgid ""
+"When selecting multiple entries in the Tag Browser match any or all of them"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:787
 msgid "Manage &user categories"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:790
+msgid "Add your own categories to the Tag Browser"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182
 msgid "Convert book %d of %d (%s)"
@@ -7839,15 +7940,15 @@ msgstr "大量轉換的佇列中的書籍"
 msgid "Queueing "
 msgstr "佇列中 "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:239
 msgid "Fetch news from "
 msgstr "取回新聞於 "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:301
 msgid "Convert existing"
 msgstr "轉換現有的"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:302
 msgid ""
 "The following books have already been converted to %s format. Do you wish to "
 "reconvert them?"
@@ -7861,77 +7962,70 @@ msgstr "還原(&R)"
 msgid "&Donate to support calibre"
 msgstr "捐款支援 calibre (&D)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:168
 msgid "&Eject connected device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:173
 msgid "&Restart"
 msgstr "重新啟動(&R)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:206
-msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
-msgstr "<p>需要協助請查閱：<a href=\"%s\">User Manual</a><br>"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:212
-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/ui.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:227
 msgid "Calibre Quick Start Guide"
 msgstr "Calibre 快速使用指南"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:384
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:389
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:381
 msgid "Cannot configure"
 msgstr "不能設定"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:377
 msgid "Cannot configure while there are running jobs."
 msgstr "當有工作仍在進行時不能設定。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:382
 msgid "Cannot configure before calibre is restarted."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:433
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:425
 msgid "No detailed info available"
 msgstr "沒有詳細資訊可用"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:434
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:426
 msgid "No detailed information is available for books on the device."
 msgstr "在這個裝置上的書籍沒有詳細資訊可用。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:486
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:478
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:506
 msgid "Conversion Error"
 msgstr "轉換時發生錯誤"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:487
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:479
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using third party tools."
 msgstr "<p>無法轉換：%s<p>它是具有 <a href=\"%s\">DRM</a> 的書籍。您必須先移除 DRM 後才能使用第三方工具。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:500
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:492
 msgid "Recipe Disabled"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:515
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:507
 msgid "<b>Failed</b>"
 msgstr "<b>失敗</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:555
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:547
 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 "是世界各地許多志工努力的成果。如果您覺得它有用，請考慮捐款以支持它的開發。"
+"you find it useful, please consider donating to support its development. "
+"Your donation helps keep calibre development going."
+msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:573
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr "還有使用中的工作。您確定要結束？"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:583
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:576
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
@@ -7941,28 +8035,21 @@ msgstr ""
 "                      現在結束可能造成裝置上的損毀。<br>\n"
 "                      您確定要結束？"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580
 msgid "WARNING: Active jobs"
 msgstr "警告：使用中的工作"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:640
+#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:633
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
 msgstr "會在系統匣中保持執行。要關閉它，請在系統匣的關聯選單中選擇<b>結束</b>。"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/update.py:52
-msgid ""
-"<span style=\"color:red; font-weight:bold\">Latest version: <a "
-"href=\"%s\">%s</a></span>"
-msgstr ""
-"<span style=\"color:red; font-weight:bold\">最新版本：<a href=\"%s\">%s</a></span>"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/update.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:56
 msgid "Update available"
 msgstr "有更新可用"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/update.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/update.py:57
 msgid ""
 "%s has been updated to version %s. See the <a href=\"http://calibre-"
 "ebook.com/whats-new\">new features</a>. Visit the download page?"
@@ -8445,42 +8532,26 @@ msgstr "貼上圖片"
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:270
 msgid ""
 "Library\n"
-"%d\n"
-"books"
+"%d books"
 msgstr ""
-"書庫\n"
-"%d\n"
-"本書"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:271
 msgid ""
 "Reader\n"
-"%s\n"
-"available"
+"%s"
 msgstr ""
-"閱讀器\n"
-"%s\n"
-"可用"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:272
 msgid ""
 "Card A\n"
-"%s\n"
-"available"
+"%s"
 msgstr ""
-"記憶卡 A\n"
-"%s\n"
-"可用"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:273
 msgid ""
 "Card B\n"
-"%s\n"
-"available"
+"%s"
 msgstr ""
-"記憶卡 B\n"
-"%s\n"
-"可用"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:277
 msgid "Click to see the books available on your computer"
@@ -8502,35 +8573,39 @@ msgstr "按這裡查看您的閱讀器記憶卡 B 中有多少書籍"
 msgid "Books located at"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:548
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:306
+msgid "free"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:557
 msgid "Change Case"
 msgstr "變更大小寫"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:549
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:558
 msgid "Upper Case"
 msgstr "全大寫"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:559
 msgid "Lower Case"
 msgstr "全小寫"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:551
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:560
 msgid "Swap Case"
 msgstr "大小寫互換"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:561
 msgid "Title Case"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:974
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:983
 msgid "Drag to resize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1015
 msgid "Show"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1012
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1022
 msgid "Hide"
 msgstr ""
 
@@ -9896,89 +9971,89 @@ msgstr "未知的新聞來源"
 msgid "The \"%s\" recipe needs a username and password."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:706
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:708
 msgid "Download finished"
 msgstr "下載完成"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:708
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:710
 msgid "Failed to download the following articles:"
 msgstr "無法下載下列文章："
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:714
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:716
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:716
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:718
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:718
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:720
 msgid "\tFailed links:"
 msgstr "\t失敗的連結："
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:807
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:809
 msgid "Could not fetch article. Run with -vv to see the reason"
 msgstr "無法取回文章。以 -vv 執行來查看原因。"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:828
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:830
 msgid "Fetching feeds..."
 msgstr "正在取回餵送..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:833
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:835
 msgid "Got feeds from index page"
 msgstr "從索引頁取得餵送"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:839
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:841
 msgid "Trying to download cover..."
 msgstr "正在嘗試下載封面..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:841
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843
 msgid "Generating masthead..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:922
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:924
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:938
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:940
 msgid "Feeds downloaded to %s"
 msgstr "將餵送下載到 %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:948
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:950
 msgid "Could not download cover: %s"
 msgstr "無法下載封面：%s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:960
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:962
 msgid "Downloading cover from %s"
 msgstr "正在從 %s 下載封面"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1002
 msgid "Masthead image downloaded"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1190
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1192
 msgid "Untitled Article"
 msgstr "無標題的文章"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1261
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1263
 msgid "Article downloaded: %s"
 msgstr "已下載的文章：%s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1272
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1274
 msgid "Article download failed: %s"
 msgstr "下載失敗的文章：%s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1289
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1291
 msgid "Fetching feed"
 msgstr "正在取回餵送"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1436
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1438
 msgid ""
 "Failed to log in, check your username and password for the calibre "
 "Periodicals service."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1452
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1454
 msgid ""
 "You do not have permission to download this issue. Either your subscription "
 "has expired or you have exceeded the maximum allowed downloads for today."
@@ -10124,6 +10199,12 @@ msgstr "不要下載 CSS 樣式表。"
 #~ msgid "Click to browse books by tags"
 #~ msgstr "點選以標籤來瀏覽書籍"
 
+#~ msgid "<p>For help see the: <a href=\"%s\">User Manual</a><br>"
+#~ msgstr "<p>需要協助請查閱：<a href=\"%s\">User Manual</a><br>"
+
+#~ 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>"
+
 #~ msgid "Choose a location for your ebook library."
 #~ msgstr "選擇您的電子書庫的位置。"
 
@@ -10163,9 +10244,56 @@ msgstr "不要下載 CSS 樣式表。"
 #~ msgid "Could not access %s. Using %s as the library."
 #~ msgstr "無法存取 %s。使用 %s 做為書庫。"
 
+#~ 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 "是世界各地許多志工努力的成果。如果您覺得它有用，請考慮捐款以支持它的開發。"
+
+#~ msgid ""
+#~ "<span style=\"color:red; font-weight:bold\">Latest version: <a "
+#~ "href=\"%s\">%s</a></span>"
+#~ msgstr ""
+#~ "<span style=\"color:red; font-weight:bold\">最新版本：<a href=\"%s\">%s</a></span>"
+
 #~ msgid "Ebook Viewer"
 #~ msgstr "電子書槍視器"
 
+#~ msgid ""
+#~ "Reader\n"
+#~ "%s\n"
+#~ "available"
+#~ msgstr ""
+#~ "閱讀器\n"
+#~ "%s\n"
+#~ "可用"
+
+#~ msgid ""
+#~ "Library\n"
+#~ "%d\n"
+#~ "books"
+#~ msgstr ""
+#~ "書庫\n"
+#~ "%d\n"
+#~ "本書"
+
+#~ msgid ""
+#~ "Card A\n"
+#~ "%s\n"
+#~ "available"
+#~ msgstr ""
+#~ "記憶卡 A\n"
+#~ "%s\n"
+#~ "可用"
+
+#~ msgid ""
+#~ "Card B\n"
+#~ "%s\n"
+#~ "available"
+#~ msgstr ""
+#~ "記憶卡 B\n"
+#~ "%s\n"
+#~ "可用"
+
 #~ msgid ""
 #~ "The format in which to output the data. Available choices: %s. Defaults is "
 #~ "text."
diff --git a/src/calibre/utils/bibtex.py b/src/calibre/utils/bibtex.py
index f4fc62d9d0..7809781f7c 100644
--- a/src/calibre/utils/bibtex.py
+++ b/src/calibre/utils/bibtex.py
@@ -4,9 +4,9 @@
     bibliograph packages.
     From http://pypi.python.org/pypi/bibliograph.core/
     from Tom Gross <itconsense@gmail.com>
-    
+
     Adapted for calibre use
-    
+
     Zope Public License (ZPL) Version 2.1
 
     A copyright notice accompanies this license document that
@@ -65,7 +65,7 @@
 __docformat__ = 'reStructuredText'
 __author__  = 'sengian <sengian1 at gmail.com>'
 
-import os, re, string
+import re, string
 
 utf8enc2latex_mapping = {
     # This is a mapping of Unicode characters to LaTeX equivalents.
@@ -75,7 +75,7 @@ utf8enc2latex_mapping = {
     #
     # The extraction has been done by the "create_unimap.py" script
     # located at <http://docutils.sf.net/tools/dev/create_unimap.py>.
-    
+
     #Fix some encoding problem between cp1252 and latin1
     # from http://www.microsoft.com/typography/unicode/1252.htm
     u'\x80': '{\\mbox{\\texteuro}}', # EURO SIGN
@@ -2521,7 +2521,7 @@ def escapeSpecialCharacters(text):
     for c in escape:
         text = text.replace(c, '\\' + c )
     return text
-    
+
 #Calibre functions
 #Go from an unicode entry to ASCII Bibtex format without encoding
 #Option to go to official ASCII Bibtex or unofficial UTF-8
@@ -2533,7 +2533,7 @@ def utf8ToBibtex(text, asccii_bibtex = True):
     if asccii_bibtex :
         text = resolveUnicode(text)
     return escapeSpecialCharacters(text)
-    
+
 def bibtex_author_format(item):
     #Format authors for Bibtex compliance (get a list as input)
     return utf8ToBibtex(u' and'.join([author for author in item]))
diff --git a/src/calibre/web/feeds/recipes/model.py b/src/calibre/web/feeds/recipes/model.py
index 5c355806fa..66c0167bb7 100644
--- a/src/calibre/web/feeds/recipes/model.py
+++ b/src/calibre/web/feeds/recipes/model.py
@@ -9,7 +9,7 @@ __docformat__ = 'restructuredtext en'
 import os, copy
 
 from PyQt4.Qt import QAbstractItemModel, QVariant, Qt, QColor, QFont, QIcon, \
-        QModelIndex, SIGNAL
+        QModelIndex, SIGNAL, QMetaObject, pyqtSlot
 
 from calibre.utils.search_query_parser import SearchQueryParser
 from calibre.gui2 import NONE
@@ -131,6 +131,16 @@ class RecipeModel(QAbstractItemModel, SearchQueryParser):
         self.scheduler_config = SchedulerConfig()
         self.do_refresh()
 
+    @pyqtSlot()
+    def do_database_change(self):
+        self.db = self.newdb
+        self.newdb = None
+        self.do_refresh()
+
+    def database_changed(self, db):
+        self.newdb = db
+        QMetaObject.invokeMethod(self, 'do_database_change', Qt.QueuedConnection)
+
     def get_builtin_recipe(self, urn, download=True):
         if download:
             try: